Refactored for new cheesto API response