Added support for arrow key mappings