Updating for latest Dart version