Added map_with