More robust storage adapter