Added old MF checks and metrics