Few changes in templates