diff --git a/src/typings/native-keymap.d.ts b/src/typings/native-keymap.d.ts
index 092191dd759..7671a421ac5 100644
--- a/src/typings/native-keymap.d.ts
+++ b/src/typings/native-keymap.d.ts
@@ -42,12 +42,28 @@ declare module 'native-keymap' {
 
 	export function getKeyMap(): IKeyboardMapping;
 
+	/* __GDPR__FRAGMENT__
+	   "IKeyboardLayoutInfo" : {
+		  "name" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "id": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "text": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	   }
+	 */
 	export interface IWindowsKeyboardLayoutInfo {
 		name: string;
 		id: string;
 		text: string;
 	}
 
+	/* __GDPR__FRAGMENT__
+	   "IKeyboardLayoutInfo" : {
+		  "model" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "layout": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "variant": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "options": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "rules": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	   }
+	 */
 	export interface ILinuxKeyboardLayoutInfo {
 		model: string;
 		layout: string;
@@ -56,6 +72,12 @@ declare module 'native-keymap' {
 		rules: string;
 	}
 
+	/* __GDPR__FRAGMENT__
+	   "IKeyboardLayoutInfo" : {
+		  "id" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "lang": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	   }
+	 */
 	export interface IMacKeyboardLayoutInfo {
 		id: string;
 		lang: string;
diff --git a/src/vs/base/parts/quickopen/common/quickOpen.ts b/src/vs/base/parts/quickopen/common/quickOpen.ts
index 2d16a043060..8850a153307 100644
--- a/src/vs/base/parts/quickopen/common/quickOpen.ts
+++ b/src/vs/base/parts/quickopen/common/quickOpen.ts
@@ -6,6 +6,11 @@
 
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
 
+/* __GDPR__FRAGMENT__
+   "IQuickNavigateConfiguration" : {
+	  "keybindings" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+   }
+ */
 export interface IQuickNavigateConfiguration {
 	keybindings: ResolvedKeybinding[];
 }
diff --git a/src/vs/editor/common/commonCodeEditor.ts b/src/vs/editor/common/commonCodeEditor.ts
index 56a286d4baf..8e8f3d966c7 100644
--- a/src/vs/editor/common/commonCodeEditor.ts
+++ b/src/vs/editor/common/commonCodeEditor.ts
@@ -1004,6 +1004,9 @@ export abstract class CommonCodeEditor extends Disposable implements editorCommo
 	protected abstract _removeDecorationType(key: string): void;
 	protected abstract _resolveDecorationOptions(typeKey: string, writable: boolean): editorCommon.IModelDecorationOptions;
 
+	/* __GDPR__FRAGMENT__
+	   "EditorTelemetryData" : {}
+	 */
 	public getTelemetryData(): { [key: string]: any; } {
 		return null;
 	}
diff --git a/src/vs/platform/search/common/search.ts b/src/vs/platform/search/common/search.ts
index ab315d50f0f..0c56bae5e39 100644
--- a/src/vs/platform/search/common/search.ts
+++ b/src/vs/platform/search/common/search.ts
@@ -70,7 +70,16 @@ export enum QueryType {
 	File = 1,
 	Text = 2
 }
-
+/* __GDPR__FRAGMENT__
+   "IPatternInfo" : {
+	  "pattern" : { "endPoint": "none", "classification": "CustomerContent", "purpose": "FeatureInsight" },
+	  "isRegExp": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+	  "isWordMatch": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+	  "wordSeparators": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+	  "isMultiline": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+	  "isCaseSensitive": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+   }
+ */
 export interface IPatternInfo {
 	pattern: string;
 	isRegExp?: boolean;
diff --git a/src/vs/platform/telemetry/common/experiments.ts b/src/vs/platform/telemetry/common/experiments.ts
index 6911c881760..710c0d2a179 100644
--- a/src/vs/platform/telemetry/common/experiments.ts
+++ b/src/vs/platform/telemetry/common/experiments.ts
@@ -8,6 +8,11 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
+/* __GDPR__FRAGMENT__
+   "IExperiments" : {
+	  "deployToAzureQuickLink" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+   }
+ */
 export interface IExperiments {
 	ripgrepQuickSearch: boolean;
 }
diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts
index 64333719176..7e78904491d 100644
--- a/src/vs/platform/telemetry/common/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/common/telemetryUtils.ts
@@ -66,6 +66,13 @@ export function anonymize(input: string): string {
 	return r;
 }
 
+/* __GDPR__FRAGMENT__
+   "URIDescriptor" : {
+	  "mimeType" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+	  "ext": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+	  "path": { "endPoint": "none", "classification": "CustomerContent", "purpose": "FeatureInsight" }
+   }
+ */
 export interface URIDescriptor {
 	mimeType?: string;
 	ext?: string;
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index dab35636156..e9dc303323c 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -387,6 +387,21 @@ function loadCommonJSModule<T>(modulePath: string, activationTimesBuilder: Exten
 }
 
 function getTelemetryActivationEvent(extensionDescription: IExtensionDescription): any {
+	/* __GDPR__FRAGMENT__
+	   "TelemetryActivationEvent" : {
+		   "id": { "endPoint": "none", "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+		   "name": { "endPoint": "none", "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+		   "publisherDisplayName": { "endPoint": "none", "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+		   "activationEvents": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		   "isBuiltin": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		   "${wildcard}": [
+			   {
+			      "${prefix}": "contribution.",
+			      "${property}": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			   }
+			]
+	   }
+	 */
 	let event = {
 		id: extensionDescription.id,
 		name: extensionDescription.name,
diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
index 903b83c6011..aa65a85917f 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -555,7 +555,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		/* __GDPR__
 		   "quickOpenWidgetShown" : {
 			  "mode" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "quickNavigate": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			  "quickNavigate": { "${inline}": [ "${IQuickNavigateConfiguration}" ] }
 		   }
 		 */
 		this.telemetryService.publicLog('quickOpenWidgetShown', { mode: handlerDescriptor.getId(), quickNavigate: quickNavigateConfiguration });
diff --git a/src/vs/workbench/common/editor/resourceEditorInput.ts b/src/vs/workbench/common/editor/resourceEditorInput.ts
index e77eff68f22..6c20c0296d8 100644
--- a/src/vs/workbench/common/editor/resourceEditorInput.ts
+++ b/src/vs/workbench/common/editor/resourceEditorInput.ts
@@ -74,7 +74,7 @@ export class ResourceEditorInput extends EditorInput {
 
 		/* __GDPR__FRAGMENT__
 		   "EditorTelemetryDescriptor" : {
-			  "resource": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			  "resource": { "${inline}": [ "${URIDescriptor}" ] }
 		   }
 		 */
 		return descriptor;
diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts
index a3f23f877c3..cf27893825f 100644
--- a/src/vs/workbench/common/editor/untitledEditorInput.ts
+++ b/src/vs/workbench/common/editor/untitledEditorInput.ts
@@ -256,7 +256,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 
 		/* __GDPR__FRAGMENT__
 		   "EditorTelemetryDescriptor" : {
-			  "resource": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			  "resource": { "${inline}": [ "${URIDescriptor}" ] }
 		   }
 		 */
 		return descriptor;
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
index 78fcc3fd385..86afd96a877 100644
--- a/src/vs/workbench/electron-browser/shell.ts
+++ b/src/vs/workbench/electron-browser/shell.ts
@@ -202,7 +202,10 @@ export class WorkbenchShell {
 		/* __GDPR__
 		   "workspaceLoad" : {
 			  "userAgent" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "windowSize": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "windowSize.innerHeight": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "windowSize.innerWidth": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "windowSize.outerHeight": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "windowSize.outerWidth": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			  "emptyWorkbench": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			  "workbench.filesToOpen": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			  "workbench.filesToCreate": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -210,7 +213,7 @@ export class WorkbenchShell {
 			  "customKeybindingsCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			  "theme": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			  "language": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "BusinessInsight" },
-			  "experiments": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "BusinessInsight" },
+			  "experiments": { "${inline}": [ "${IExperiments}" ] },
 			  "pinnedViewlets": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			  "restoredViewlet": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			  "restoredEditors": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
diff --git a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
index fdd06599dd5..0bc00a4682d 100644
--- a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
+++ b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
@@ -279,7 +279,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 
 		/* __GDPR__FRAGMENT__
 		   "EditorTelemetryDescriptor" : {
-			  "resource": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			  "resource": { "${inline}": [ "${URIDescriptor}" ] }
 		   }
 		 */
 		return descriptor;
diff --git a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
index 5eb9fd1c02d..9618eb9da27 100644
--- a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
+++ b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts
@@ -38,10 +38,44 @@ interface ISearchWithRange {
 	  "unsortedResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 	  "sortedResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 	  "resultCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "symbols": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "files": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+	  "symbols.fromCache": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.fromCache": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.unsortedResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.sortedResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.resultCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.traversal": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.errors": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.fileWalkStartDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.fileWalkResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.directoriesWalked": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.filesWalked": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.cmdForkStartTime": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.cmdForkResultTime": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.cmdResultCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.cacheLookupStartDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.cacheFilterStartDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.cacheLookupResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.cacheEntryCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.fromCache": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.unsortedResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.sortedResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.resultCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.traversal": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.errors": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.fileWalkStartDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.fileWalkResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.directoriesWalked": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.filesWalked": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.cmdForkStartTime": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.cmdForkResultTime": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.cmdResultCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.cacheLookupStartDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.cacheFilterStartDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.cacheLookupResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "files.joined.cacheEntryCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
    }
  */
+// GDPR__TODO joined seems to be recursive
 interface ITimerEventData {
 	searchLength: number;
 	unsortedResultDuration: number;
diff --git a/src/vs/workbench/parts/search/common/searchModel.ts b/src/vs/workbench/parts/search/common/searchModel.ts
index eab71a0dbe3..a02fb3fed95 100644
--- a/src/vs/workbench/parts/search/common/searchModel.ts
+++ b/src/vs/workbench/parts/search/common/searchModel.ts
@@ -773,7 +773,7 @@ export class SearchModel extends Disposable {
 		   "searchresultsShown" : {
 			  "count" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			  "fileCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "options": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "options": { "${inline}": [ "${IPatternInfo}" ] },
 			  "duration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 			  "useRipgrep": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 		   }
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
index ab87d7eaa7f..663f6388880 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
@@ -411,7 +411,7 @@ class WelcomePage {
 		/* __GDPR__FRAGMENT__
 		   "WelcomePageInstall-1" : {
 			  "from" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "extensionsId": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			  "extensionId": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 		   }
 		 */
 		this.telemetryService.publicLog(strings.installEvent, {
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
index 64d860ee3fa..19e28ae242b 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
@@ -354,6 +354,12 @@ export class WalkThroughPart extends BaseEditor {
 					const div = innerContent.querySelector(`#${id.replace(/\./g, '\\.')}`) as HTMLElement;
 
 					const options = this.getEditorOptions(snippet.textEditorModel.getModeId());
+					/* __GDPR__FRAGMENT__
+					   "EditorTelemetryData" : {
+						  "target" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						  "snippet": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					   }
+					 */
 					const telemetryData = {
 						target: this.input instanceof WalkThroughInput ? this.input.getTelemetryFrom() : undefined,
 						snippet: i
diff --git a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
index 442196b87d9..f3a4610d00f 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
@@ -96,7 +96,7 @@ export class WalkThroughInput extends EditorInput {
 		/* __GDPR__FRAGMENT__
 		   "EditorTelemetryDescriptor" : {
 			  "target" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-			  "resource": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			  "resource": { "${inline}": [ "${URIDescriptor}" ] }
 		   }
 		 */
 		return descriptor;
diff --git a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
index 41db4494907..69d92d5f6ac 100644
--- a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
+++ b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
@@ -320,7 +320,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 		let data = KeyboardMapperFactory.INSTANCE.getCurrentKeyboardLayout();
 		/* __GDPR__
 		   "keyboardLayout" : {
-			  "currentKeyboardLayout" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			   "currentKeyboardLayout": { "${inline}": [ "${IKeyboardLayoutInfo}" ] }
 		   }
 		 */
 		telemetryService.publicLog('keyboardLayout', {
diff --git a/src/vs/workbench/services/timer/common/timerService.ts b/src/vs/workbench/services/timer/common/timerService.ts
index f2a5554b3c2..bea8fad317f 100644
--- a/src/vs/workbench/services/timer/common/timerService.ts
+++ b/src/vs/workbench/services/timer/common/timerService.ts
@@ -8,6 +8,14 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 
 export const ITimerService = createDecorator<ITimerService>('timerService');
 
+/* __GDPR__FRAGMENT__
+   "IMemoryInfo" : {
+	  "workingSetSize" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "peakWorkingSetSize": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "privateBytes": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "sharedBytes": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+   }
+ */
 export interface IMemoryInfo {
 	workingSetSize: number;
 	peakWorkingSetSize: number;
@@ -19,14 +27,25 @@ export interface IMemoryInfo {
    "IStartupMetrics" : {
 	  "version" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 	  "ellapsed" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "timers" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "timers.ellapsedAppReady" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "timers.ellapsedWindowLoad" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "timers.ellapsedWindowLoadToRequire" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "timers.ellapsedExtensions" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "timers.ellapsedExtensionsReady" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "timers.ellapsedRequire" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "timers.ellapsedViewletRestore" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "timers.ellapsedEditorRestore" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "timers.ellapsedWorkbench" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "timers.ellapsedTimersToTimersComputed" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 	  "timers2" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 	  "platform" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 	  "release" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 	  "arch" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 	  "totalmem" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "meminfo" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
-	  "cpus" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "meminfo" : { "${inline}": [ "${IMemoryInfo}" ] },
+	  "cpus.count" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "cpus.speed" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+	  "cpus.model" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 	  "initialStartup" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 	  "hasAccessibilitySupport" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 	  "isVMLikelyhood" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
@@ -49,6 +68,7 @@ export interface IStartupMetrics {
 		ellapsedWorkbench: number;
 		ellapsedTimersToTimersComputed: number;
 	};
+	// GDPR__TODO: Dynamic property set with timer2, cannot be declared in the registry
 	timers2: { [name: string]: number };
 	platform: string;
 	release: string;