Upgrade to Dart M3