Update for CatalogFoundation 2.1