added map to fields and primitive types to primitives