Updated to use Async suffix