Made it easier to define a storage