Rework API, mainly around Comparisons.