Added keypad support