Support the catalog query endpoints