Renamed ArrayStorage to ArrayOrderStorage