Added keyboard shortcut recognition