Added self-registering of the catalog