Simplification of storage, extension of locations.