Added client templates