Serialization improvements.