Added type mapping for enum