Update with latest changes from template