Updated templates and variables