Added metrics and spectral