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