Major update of templating logic and calculations