Refactor, add extension points for invites