Added PrimitiveFactory.