Added basic templating system