Moved ArrayCollection to OrderedSetCollection