Refactored catalog APIs according to Brian.