Introduced PrimitiveType into type hierarchy