Added conditional array class