add basic shortcut support