Added templating system