add class ArrayStorage and IndexingVariables