Refactor build() to create() in Builders