Base: Initial change to storage wrapper