Add NSOrderedSet support