Complete rework of AbstractStorage