Modified the BuilderFactoryHelper to support multiple calls to the BuilderFactory.