Removing the need to operate on MappableDataObject descendants; this class removed