Added Async support (was extracted as of 2.11)