Added support for numpad