Added support to create shortcut