Update to Dart M3