Updates to MFD and IMP