Added addition of templates