Refactor shortcut calling mechanism