Update templates and api