Refactor UserRepository and RoleRepository