Improved map and graph controller