Removed redundancies. Mapped types to CIMI Primitive and non-Primitive types