updated field type mapping