Added support for arrow keys