Yes, but I haven't figured out exactly what to do with the maps, and this is using the old name-based mapping scheme. Where possible I am now using handles rather than names, but I still an need to produce the OS name -> CONTAM index mapping for debugging. I was considering replacing this function with something that created a name-based mapping, and then adding member functions to return the "public" handle-based maps.