Added a PrimitiveBuilderFactory