Improvements in the templates