renamed GeneralBuilder to OutputBuilder and PropBuilder to OutputPropBuilder