Hotkeys support added