Switch from async to highland