Update to support latest Dart