I believe my deserialisation approach should mean this is safe to chaneg