added new shortcut support