Manage invitation refactor