Update for dart 1.0