Updated roles and users