Added and improved async