Rework DataObjectSerializer implementations