Changes for Role-based Authorization