Dominic: simplify serialisation