Simplify serialization mechanism