Fixed dump
Update destructors for these classes
Changed from map to multimap