Reduce rework in serialization