Adjustments to use catalog info in config file