Further refactors to support update or --continue of catalogs