Update to support async