Added calculation of storage space