Improved the templating service