Serialization rework