Adding templating