Migrated large portions of Cinderella to StorageService