Add templating to upcoming features