Serialisation improvements.