Change the structure to include Shortcuts and Collaborators