Simplify serialization