Replace ComparableSet with a Requirements collection