More storage logic