some refactoring to be adherent to the UserWrapperInterface