Decouple caluclation of elementary metrics from Solution implementation.