Added baseStorageSuffix parameter to disk storage
Removed lazy loading from disk storage