Lots of changes implementing new userRoles