Add NSOrderedSet logic