improve extensibility of storage class