Refactored Async patterns