Minor amendments for Async support