Fix generation of VTK files
Separate sets, maps, descriptors