Revert "Revert "Catalog""

This reverts commit 1db15cf4f9f4667d7fcc12860ed73115f8fc5acc.