Added custom shortcut name support