Changes to templates to support 2.9