Fixed collection mapping for user roles, and added constraints