adapt to refactored catalog.