New class User Builder and refactoring for spring implementation