Added keypad and models