Update templates for more generic API