Basic templating added