Update to async code