Small refactoring of User and UserRole entities