Change catalog structure for API