Small refactoring to RoleStore