Added templating feature