Hotkey support added