[IMP-dev] Abstracting storage