added twoStageBuilderFactory and made the two stage builder updatable