Minor changes to serialization structure