Added template structure