Added support for map field type.