More progress adding the compensation to the DFlowData class.