Add support for StringSets and NumberSets