Another template update for #209