Adding keypad support