Added support for async loop context
4 files changed