Extended with names of locations in chart