Minor work on template file