Work on storage configuration and expiry