Added support for numpad keys and operands