Added MFR compatibility