Serialization tweak