Moving to PrimitiveType enumeration