Added Additional Templating and Data additions