Few changes in Templater and Models