Added templating capabilities
Added templating capabilities