Few changes on templates