Class Catalog now uses a public constructor