Added some improvements to templates