CMS-2192 Templates API design