More changes for DFM