Update to template format