Refactored catalog service