Improved async support and improved mapping