Use builder pattern for building, no need to subclass builder anymore