Update with templates