Updated templates to latest standard