Added support for common key codes