More changes for roles and privileges