RoleEntity refactoring