updated for dart beta SDK