Updating template for #367