Add collaborator support
Add gollum support