Changes for map measurements