Simplifying storageManager code