Added support for maps of complex types (e.g. structures) to the query serializer.