Added async methods and callbacks to code