Add BoP support to MFR