Added arrow key compatibility