Collaboration refactor to use the new user lookup.