Migrate from callbacks to async-await