Replace async with map-async