Refactored out the factory chain of the builder to be more additive as per builder design