Improved performance

Now using await Task.WhenAll.