Added scoreMaps; added other score types