Change all returned ComparableEntry to Entry