Complete port to new data format for map and graph - PC still missing, currently disabled