Added some changes to templates