#25 improved Class Hierarchy for API responses