Moved shortcut handling to CommandScope