Added Hotkey Support