Serialisation now fully based on TMP.