Adjusted default template code