Updated populateRoles