Template Engine modified