Utilising the storage manager more.