Serialization/storage of map-type data structures
Re-opened more of the old plumbing