ComparisonPerformer changed.
More core refactoring