Another round of updates on Async/Await