Added support for Hotkey