Issue #134: Catalog directive