Added resumable/await support