Simplify Catalog for demo