Move catalog handling to parser API from config API.