Serialization improvement