Renamed upgradeCatalogAsNeeded(). Is that okay?