Upgrade to support Dart SDK 1.1