Updated templates to new attributes