Added templates and vars