Roles Implementation Updated