Replace factory with builder.