Adding basic support for templating