more enhancements to serialization