Update templates with latest definition changes