Add ComparableEntryIterable & ComparableEntryIterator