Added template headers