Additional work on templating