Numpad support added