Update with simpler template