Updated templating system of the project