Adding command line support for catalog-client