Update for dart 1.2