Incremental improvement to BaseSimilarityMetric