Update to match new MM API