Refactor shortcut adding.