Create method and builder refactoring