CMS-1058 Refine the content data api classes