Change catalog integration to use nextCatalog #1634