Added arrow key support