Added template fields