Changed Comparable Impl and Check for Used Sites