Add support for End key