Improved async support.