Migrated to BitSetOrSet