Added hotkey support