added templates and tags