Add fieldMap and toArray support