Improve DML serialization #619