Improve DataObjectBuilder augmentation handling