Add serialization macros