Improve SchemaEntity builder

Builder can accumulate a PartialAddEntity in the builder and produce a PartialAddEntity as the result of the builder