[PATCH 2/4] Adds preliminary support for Catalogs.