Update to wrap async calls with async.parallel