Updated api signature to better match async guideliness