Used the new getStorage() on Repository.