Code refactor
MFR integration