Modified dispatcher to use new Await tree structure.