catalog-generator: use common code