Added hotkeys support