Added shortcut support