Eliminate use of addAugmentation(Class, DataObject)