Upgrade to support Dart 1.4