Improve handling of storage info