[mfs] Modernize