Added support for shortcut