Adjust mapping metrics and graph