added templates and helpers