REF-92 - Update for user role management

REF-92 - Update for user role management