add more placeholders to template
Merge branch 'templating'