Modified templates to match new version