improve catalogService