Updated to be compatible with Dart's M4 release