Added arrow keys support