Updated Async stuff