Add ArrayStorage + Refactoring StackableStorage