Use new way of adding templates.