added map and graph