modify instantiation of Storage