Migrate to async manager API