DDF-231 - added template stuff back to template