diff --git a/lib/services/eventgrid/LICENSE.txt b/lib/services/eventgrid/LICENSE.txt
index 5431ba98b9..8f3d856145 100644
--- a/lib/services/eventgrid/LICENSE.txt
+++ b/lib/services/eventgrid/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Microsoft
+Copyright (c) 2019 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/services/eventgrid/lib/models/containerRegistryArtifactEventData.js b/lib/services/eventgrid/lib/models/containerRegistryArtifactEventData.js
new file mode 100644
index 0000000000..01daeac106
--- /dev/null
+++ b/lib/services/eventgrid/lib/models/containerRegistryArtifactEventData.js
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+/**
+ * The content of the event request message.
+ *
+ */
+class ContainerRegistryArtifactEventData {
+  /**
+   * Create a ContainerRegistryArtifactEventData.
+   * @member {string} [id] The event ID.
+   * @member {date} [timestamp] The time at which the event occurred.
+   * @member {string} [action] The action that encompasses the provided event.
+   * @member {object} [target] The target of the event.
+   * @member {string} [target.mediaType] The MIME type of the artifact.
+   * @member {number} [target.size] The size in bytes of the artifact.
+   * @member {string} [target.digest] The digest of the artifact.
+   * @member {string} [target.repository] The repository name of the artifact.
+   * @member {string} [target.tag] The tag of the artifact.
+   * @member {string} [target.name] The name of the artifact.
+   * @member {string} [target.version] The version of the artifact.
+   */
+  constructor() {
+  }
+
+  /**
+   * Defines the metadata of ContainerRegistryArtifactEventData
+   *
+   * @returns {object} metadata of ContainerRegistryArtifactEventData
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'ContainerRegistryArtifactEventData',
+      type: {
+        name: 'Composite',
+        className: 'ContainerRegistryArtifactEventData',
+        modelProperties: {
+          id: {
+            required: false,
+            serializedName: 'id',
+            type: {
+              name: 'String'
+            }
+          },
+          timestamp: {
+            required: false,
+            serializedName: 'timestamp',
+            type: {
+              name: 'DateTime'
+            }
+          },
+          action: {
+            required: false,
+            serializedName: 'action',
+            type: {
+              name: 'String'
+            }
+          },
+          target: {
+            required: false,
+            serializedName: 'target',
+            type: {
+              name: 'Composite',
+              className: 'ContainerRegistryArtifactEventTarget'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = ContainerRegistryArtifactEventData;
diff --git a/lib/services/eventgrid/lib/models/containerRegistryArtifactEventTarget.js b/lib/services/eventgrid/lib/models/containerRegistryArtifactEventTarget.js
new file mode 100644
index 0000000000..31bfc48d0e
--- /dev/null
+++ b/lib/services/eventgrid/lib/models/containerRegistryArtifactEventTarget.js
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+/**
+ * The target of the event.
+ *
+ */
+class ContainerRegistryArtifactEventTarget {
+  /**
+   * Create a ContainerRegistryArtifactEventTarget.
+   * @member {string} [mediaType] The MIME type of the artifact.
+   * @member {number} [size] The size in bytes of the artifact.
+   * @member {string} [digest] The digest of the artifact.
+   * @member {string} [repository] The repository name of the artifact.
+   * @member {string} [tag] The tag of the artifact.
+   * @member {string} [name] The name of the artifact.
+   * @member {string} [version] The version of the artifact.
+   */
+  constructor() {
+  }
+
+  /**
+   * Defines the metadata of ContainerRegistryArtifactEventTarget
+   *
+   * @returns {object} metadata of ContainerRegistryArtifactEventTarget
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'ContainerRegistryArtifactEventTarget',
+      type: {
+        name: 'Composite',
+        className: 'ContainerRegistryArtifactEventTarget',
+        modelProperties: {
+          mediaType: {
+            required: false,
+            serializedName: 'mediaType',
+            type: {
+              name: 'String'
+            }
+          },
+          size: {
+            required: false,
+            serializedName: 'size',
+            type: {
+              name: 'Number'
+            }
+          },
+          digest: {
+            required: false,
+            serializedName: 'digest',
+            type: {
+              name: 'String'
+            }
+          },
+          repository: {
+            required: false,
+            serializedName: 'repository',
+            type: {
+              name: 'String'
+            }
+          },
+          tag: {
+            required: false,
+            serializedName: 'tag',
+            type: {
+              name: 'String'
+            }
+          },
+          name: {
+            required: false,
+            serializedName: 'name',
+            type: {
+              name: 'String'
+            }
+          },
+          version: {
+            required: false,
+            serializedName: 'version',
+            type: {
+              name: 'String'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = ContainerRegistryArtifactEventTarget;
diff --git a/lib/services/eventgrid/lib/models/containerRegistryChartDeletedEventData.js b/lib/services/eventgrid/lib/models/containerRegistryChartDeletedEventData.js
new file mode 100644
index 0000000000..735091ec31
--- /dev/null
+++ b/lib/services/eventgrid/lib/models/containerRegistryChartDeletedEventData.js
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+const models = require('./index');
+
+/**
+ * Schema of the Data property of an EventGridEvent for a
+ * Microsoft.ContainerRegistry.ChartDeleted event.
+ *
+ * @extends models['ContainerRegistryArtifactEventData']
+ */
+class ContainerRegistryChartDeletedEventData extends models['ContainerRegistryArtifactEventData'] {
+  /**
+   * Create a ContainerRegistryChartDeletedEventData.
+   */
+  constructor() {
+    super();
+  }
+
+  /**
+   * Defines the metadata of ContainerRegistryChartDeletedEventData
+   *
+   * @returns {object} metadata of ContainerRegistryChartDeletedEventData
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'ContainerRegistryChartDeletedEventData',
+      type: {
+        name: 'Composite',
+        className: 'ContainerRegistryChartDeletedEventData',
+        modelProperties: {
+          id: {
+            required: false,
+            serializedName: 'id',
+            type: {
+              name: 'String'
+            }
+          },
+          timestamp: {
+            required: false,
+            serializedName: 'timestamp',
+            type: {
+              name: 'DateTime'
+            }
+          },
+          action: {
+            required: false,
+            serializedName: 'action',
+            type: {
+              name: 'String'
+            }
+          },
+          target: {
+            required: false,
+            serializedName: 'target',
+            type: {
+              name: 'Composite',
+              className: 'ContainerRegistryArtifactEventTarget'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = ContainerRegistryChartDeletedEventData;
diff --git a/lib/services/eventgrid/lib/models/containerRegistryChartPushedEventData.js b/lib/services/eventgrid/lib/models/containerRegistryChartPushedEventData.js
new file mode 100644
index 0000000000..778e0e9040
--- /dev/null
+++ b/lib/services/eventgrid/lib/models/containerRegistryChartPushedEventData.js
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+const models = require('./index');
+
+/**
+ * Schema of the Data property of an EventGridEvent for a
+ * Microsoft.ContainerRegistry.ChartPushed event.
+ *
+ * @extends models['ContainerRegistryArtifactEventData']
+ */
+class ContainerRegistryChartPushedEventData extends models['ContainerRegistryArtifactEventData'] {
+  /**
+   * Create a ContainerRegistryChartPushedEventData.
+   */
+  constructor() {
+    super();
+  }
+
+  /**
+   * Defines the metadata of ContainerRegistryChartPushedEventData
+   *
+   * @returns {object} metadata of ContainerRegistryChartPushedEventData
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'ContainerRegistryChartPushedEventData',
+      type: {
+        name: 'Composite',
+        className: 'ContainerRegistryChartPushedEventData',
+        modelProperties: {
+          id: {
+            required: false,
+            serializedName: 'id',
+            type: {
+              name: 'String'
+            }
+          },
+          timestamp: {
+            required: false,
+            serializedName: 'timestamp',
+            type: {
+              name: 'DateTime'
+            }
+          },
+          action: {
+            required: false,
+            serializedName: 'action',
+            type: {
+              name: 'String'
+            }
+          },
+          target: {
+            required: false,
+            serializedName: 'target',
+            type: {
+              name: 'Composite',
+              className: 'ContainerRegistryArtifactEventTarget'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = ContainerRegistryChartPushedEventData;
diff --git a/lib/services/eventgrid/lib/models/index.d.ts b/lib/services/eventgrid/lib/models/index.d.ts
index 96c7542f8d..89330e0e5e 100644
--- a/lib/services/eventgrid/lib/models/index.d.ts
+++ b/lib/services/eventgrid/lib/models/index.d.ts
@@ -896,6 +896,53 @@ export interface ContainerRegistryImagePushedEventData extends ContainerRegistry
 export interface ContainerRegistryImageDeletedEventData extends ContainerRegistryEventData {
 }
 
+/**
+ * @class
+ * Initializes a new instance of the ContainerRegistryArtifactEventData class.
+ * @constructor
+ * The content of the event request message.
+ *
+ * @member {string} [id] The event ID.
+ * @member {date} [timestamp] The time at which the event occurred.
+ * @member {string} [action] The action that encompasses the provided event.
+ * @member {object} [target] The target of the event.
+ * @member {string} [target.mediaType] The MIME type of the artifact.
+ * @member {number} [target.size] The size in bytes of the artifact.
+ * @member {string} [target.digest] The digest of the artifact.
+ * @member {string} [target.repository] The repository name of the artifact.
+ * @member {string} [target.tag] The tag of the artifact.
+ * @member {string} [target.name] The name of the artifact.
+ * @member {string} [target.version] The version of the artifact.
+ */
+export interface ContainerRegistryArtifactEventData {
+  id?: string;
+  timestamp?: Date;
+  action?: string;
+  target?: ContainerRegistryArtifactEventTarget;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the ContainerRegistryChartPushedEventData class.
+ * @constructor
+ * Schema of the Data property of an EventGridEvent for a
+ * Microsoft.ContainerRegistry.ChartPushed event.
+ *
+ */
+export interface ContainerRegistryChartPushedEventData extends ContainerRegistryArtifactEventData {
+}
+
+/**
+ * @class
+ * Initializes a new instance of the ContainerRegistryChartDeletedEventData class.
+ * @constructor
+ * Schema of the Data property of an EventGridEvent for a
+ * Microsoft.ContainerRegistry.ChartDeleted event.
+ *
+ */
+export interface ContainerRegistryChartDeletedEventData extends ContainerRegistryArtifactEventData {
+}
+
 /**
  * @class
  * Initializes a new instance of the ContainerRegistryEventTarget class.
@@ -978,6 +1025,30 @@ export interface ContainerRegistryEventSource {
   instanceID?: string;
 }
 
+/**
+ * @class
+ * Initializes a new instance of the ContainerRegistryArtifactEventTarget class.
+ * @constructor
+ * The target of the event.
+ *
+ * @member {string} [mediaType] The MIME type of the artifact.
+ * @member {number} [size] The size in bytes of the artifact.
+ * @member {string} [digest] The digest of the artifact.
+ * @member {string} [repository] The repository name of the artifact.
+ * @member {string} [tag] The tag of the artifact.
+ * @member {string} [name] The name of the artifact.
+ * @member {string} [version] The version of the artifact.
+ */
+export interface ContainerRegistryArtifactEventTarget {
+  mediaType?: string;
+  size?: number;
+  digest?: string;
+  repository?: string;
+  tag?: string;
+  name?: string;
+  version?: string;
+}
+
 /**
  * @class
  * Initializes a new instance of the ServiceBusActiveMessagesAvailableWithNoListenersEventData class.
@@ -1150,6 +1221,22 @@ export interface MediaJobOutputAsset extends MediaJobOutput {
   assetName?: string;
 }
 
+/**
+ * @class
+ * Initializes a new instance of the MediaJobOutputProgressEventData class.
+ * @constructor
+ * Job Output Progress Event Data.
+ *
+ * @member {string} [label] Gets the Job output label.
+ * @member {number} [progress] Gets the Job output progress.
+ * @member {object} [jobCorrelationData] Gets the Job correlation data.
+ */
+export interface MediaJobOutputProgressEventData {
+  label?: string;
+  progress?: number;
+  jobCorrelationData?: { [propertyName: string]: string };
+}
+
 /**
  * @class
  * Initializes a new instance of the MediaJobOutputStateChangeEventData class.
@@ -1462,7 +1549,7 @@ export interface MediaLiveEventIncomingVideoStreamsOutOfSyncEventData {
  * @class
  * Initializes a new instance of the MediaLiveEventIncomingDataChunkDroppedEventData class.
  * @constructor
- * Ingest fragment dropped event event data.
+ * Ingest fragment dropped event data.
  *
  * @member {string} [timestamp] Gets the timestamp of the data chunk dropped.
  * @member {string} [trackType] Gets the type of the track (Audio / Video).
@@ -1486,7 +1573,7 @@ export interface MediaLiveEventIncomingDataChunkDroppedEventData {
  * @class
  * Initializes a new instance of the MediaLiveEventIngestHeartbeatEventData class.
  * @constructor
- * Ingest fragment dropped event event data.
+ * Ingest fragment dropped event data.
  *
  * @member {string} [trackType] Gets the type of the track (Audio / Video).
  * @member {string} [trackName] Gets the track name.
@@ -1545,3 +1632,95 @@ export interface MediaLiveEventTrackDiscontinuityDetectedEventData {
   readonly discontinuityGap?: string;
 }
 
+/**
+ * @class
+ * Initializes a new instance of the MapsGeofenceEventProperties class.
+ * @constructor
+ * Schema of the Data property of an EventGridEvent for a Geofence event
+ * (GeofenceEntered, GeofenceExited, GeofenceResult).
+ *
+ * @member {array} [expiredGeofenceGeometryId] Lists of the geometry ID of the
+ * geofence which is expired relative to the user time in the request.
+ * @member {array} [geometries] Lists the fence geometries that either fully
+ * contain the coordinate position or have an overlap with the searchBuffer
+ * around the fence.
+ * @member {array} [invalidPeriodGeofenceGeometryId] Lists of the geometry ID
+ * of the geofence which is in invalid period relative to the user time in the
+ * request.
+ * @member {boolean} [isEventPublished] True if at least one event is published
+ * to the Azure Maps event subscriber, false if no event is published to the
+ * Azure Maps event subscriber.
+ */
+export interface MapsGeofenceEventProperties {
+  expiredGeofenceGeometryId?: string[];
+  geometries?: MapsGeofenceGeometry[];
+  invalidPeriodGeofenceGeometryId?: string[];
+  isEventPublished?: boolean;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the MapsGeofenceEnteredEventData class.
+ * @constructor
+ * Schema of the Data property of an EventGridEvent for a
+ * Microsoft.Maps.GeofenceEntered event.
+ *
+ */
+export interface MapsGeofenceEnteredEventData extends MapsGeofenceEventProperties {
+}
+
+/**
+ * @class
+ * Initializes a new instance of the MapsGeofenceExitedEventData class.
+ * @constructor
+ * Schema of the Data property of an EventGridEvent for a
+ * Microsoft.Maps.GeofenceExited event.
+ *
+ */
+export interface MapsGeofenceExitedEventData extends MapsGeofenceEventProperties {
+}
+
+/**
+ * @class
+ * Initializes a new instance of the MapsGeofenceResultEventData class.
+ * @constructor
+ * Schema of the Data property of an EventGridEvent for a
+ * Microsoft.Maps.GeofenceResult event.
+ *
+ */
+export interface MapsGeofenceResultEventData extends MapsGeofenceEventProperties {
+}
+
+/**
+ * @class
+ * Initializes a new instance of the MapsGeofenceGeometry class.
+ * @constructor
+ * The geofence geometry.
+ *
+ * @member {string} [deviceId] ID of the device.
+ * @member {number} [distance] Distance from the coordinate to the closest
+ * border of the geofence. Positive means the coordinate is outside of the
+ * geofence. If the coordinate is outside of the geofence, but more than the
+ * value of searchBuffer away from the closest geofence border, then the value
+ * is 999. Negative means the coordinate is inside of the geofence. If the
+ * coordinate is inside the polygon, but more than the value of searchBuffer
+ * away from the closest geofencing border,then the value is -999. A value of
+ * 999 means that there is great confidence the coordinate is well outside the
+ * geofence. A value of -999 means that there is great confidence the
+ * coordinate is well within the geofence.
+ * @member {string} [geometryId] The unique ID for the geofence geometry.
+ * @member {number} [nearestLat] Latitude of the nearest point of the geometry.
+ * @member {number} [nearestLon] Longitude of the nearest point of the
+ * geometry.
+ * @member {string} [udId] The unique id returned from user upload service when
+ * uploading a geofence. Will not be included in geofencing post API.
+ */
+export interface MapsGeofenceGeometry {
+  deviceId?: string;
+  distance?: number;
+  geometryId?: string;
+  nearestLat?: number;
+  nearestLon?: number;
+  udId?: string;
+}
+
diff --git a/lib/services/eventgrid/lib/models/index.js b/lib/services/eventgrid/lib/models/index.js
index 0920724ca0..055c0365e1 100644
--- a/lib/services/eventgrid/lib/models/index.js
+++ b/lib/services/eventgrid/lib/models/index.js
@@ -49,10 +49,14 @@ exports.DeviceConnectionStateEventInfo = require('./deviceConnectionStateEventIn
 exports.ContainerRegistryEventData = require('./containerRegistryEventData');
 exports.ContainerRegistryImagePushedEventData = require('./containerRegistryImagePushedEventData');
 exports.ContainerRegistryImageDeletedEventData = require('./containerRegistryImageDeletedEventData');
+exports.ContainerRegistryArtifactEventData = require('./containerRegistryArtifactEventData');
+exports.ContainerRegistryChartPushedEventData = require('./containerRegistryChartPushedEventData');
+exports.ContainerRegistryChartDeletedEventData = require('./containerRegistryChartDeletedEventData');
 exports.ContainerRegistryEventTarget = require('./containerRegistryEventTarget');
 exports.ContainerRegistryEventRequest = require('./containerRegistryEventRequest');
 exports.ContainerRegistryEventActor = require('./containerRegistryEventActor');
 exports.ContainerRegistryEventSource = require('./containerRegistryEventSource');
+exports.ContainerRegistryArtifactEventTarget = require('./containerRegistryArtifactEventTarget');
 exports.ServiceBusActiveMessagesAvailableWithNoListenersEventData = require('./serviceBusActiveMessagesAvailableWithNoListenersEventData');
 exports.ServiceBusDeadletterMessagesAvailableWithNoListenersEventData = require('./serviceBusDeadletterMessagesAvailableWithNoListenersEventData');
 exports.MediaJobStateChangeEventData = require('./mediaJobStateChangeEventData');
@@ -60,6 +64,7 @@ exports.MediaJobErrorDetail = require('./mediaJobErrorDetail');
 exports.MediaJobError = require('./mediaJobError');
 exports.MediaJobOutput = require('./mediaJobOutput');
 exports.MediaJobOutputAsset = require('./mediaJobOutputAsset');
+exports.MediaJobOutputProgressEventData = require('./mediaJobOutputProgressEventData');
 exports.MediaJobOutputStateChangeEventData = require('./mediaJobOutputStateChangeEventData');
 exports.MediaJobScheduledEventData = require('./mediaJobScheduledEventData');
 exports.MediaJobProcessingEventData = require('./mediaJobProcessingEventData');
@@ -82,6 +87,11 @@ exports.MediaLiveEventIncomingVideoStreamsOutOfSyncEventData = require('./mediaL
 exports.MediaLiveEventIncomingDataChunkDroppedEventData = require('./mediaLiveEventIncomingDataChunkDroppedEventData');
 exports.MediaLiveEventIngestHeartbeatEventData = require('./mediaLiveEventIngestHeartbeatEventData');
 exports.MediaLiveEventTrackDiscontinuityDetectedEventData = require('./mediaLiveEventTrackDiscontinuityDetectedEventData');
+exports.MapsGeofenceEventProperties = require('./mapsGeofenceEventProperties');
+exports.MapsGeofenceEnteredEventData = require('./mapsGeofenceEnteredEventData');
+exports.MapsGeofenceExitedEventData = require('./mapsGeofenceExitedEventData');
+exports.MapsGeofenceResultEventData = require('./mapsGeofenceResultEventData');
+exports.MapsGeofenceGeometry = require('./mapsGeofenceGeometry');
 exports.discriminators = {
   'MediaJobOutput' : exports.MediaJobOutput,
   'MediaJobOutput.#Microsoft.Media.JobOutputAsset' : exports.MediaJobOutputAsset
diff --git a/lib/services/eventgrid/lib/models/mapsGeofenceEnteredEventData.js b/lib/services/eventgrid/lib/models/mapsGeofenceEnteredEventData.js
new file mode 100644
index 0000000000..8830567e85
--- /dev/null
+++ b/lib/services/eventgrid/lib/models/mapsGeofenceEnteredEventData.js
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+const models = require('./index');
+
+/**
+ * Schema of the Data property of an EventGridEvent for a
+ * Microsoft.Maps.GeofenceEntered event.
+ *
+ * @extends models['MapsGeofenceEventProperties']
+ */
+class MapsGeofenceEnteredEventData extends models['MapsGeofenceEventProperties'] {
+  /**
+   * Create a MapsGeofenceEnteredEventData.
+   */
+  constructor() {
+    super();
+  }
+
+  /**
+   * Defines the metadata of MapsGeofenceEnteredEventData
+   *
+   * @returns {object} metadata of MapsGeofenceEnteredEventData
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'MapsGeofenceEnteredEventData',
+      type: {
+        name: 'Composite',
+        className: 'MapsGeofenceEnteredEventData',
+        modelProperties: {
+          expiredGeofenceGeometryId: {
+            required: false,
+            serializedName: 'expiredGeofenceGeometryId',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'StringElementType',
+                  type: {
+                    name: 'String'
+                  }
+              }
+            }
+          },
+          geometries: {
+            required: false,
+            serializedName: 'geometries',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'MapsGeofenceGeometryElementType',
+                  type: {
+                    name: 'Composite',
+                    className: 'MapsGeofenceGeometry'
+                  }
+              }
+            }
+          },
+          invalidPeriodGeofenceGeometryId: {
+            required: false,
+            serializedName: 'invalidPeriodGeofenceGeometryId',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'StringElementType',
+                  type: {
+                    name: 'String'
+                  }
+              }
+            }
+          },
+          isEventPublished: {
+            required: false,
+            serializedName: 'isEventPublished',
+            type: {
+              name: 'Boolean'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = MapsGeofenceEnteredEventData;
diff --git a/lib/services/eventgrid/lib/models/mapsGeofenceEventProperties.js b/lib/services/eventgrid/lib/models/mapsGeofenceEventProperties.js
new file mode 100644
index 0000000000..247b839505
--- /dev/null
+++ b/lib/services/eventgrid/lib/models/mapsGeofenceEventProperties.js
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+/**
+ * Schema of the Data property of an EventGridEvent for a Geofence event
+ * (GeofenceEntered, GeofenceExited, GeofenceResult).
+ *
+ */
+class MapsGeofenceEventProperties {
+  /**
+   * Create a MapsGeofenceEventProperties.
+   * @member {array} [expiredGeofenceGeometryId] Lists of the geometry ID of
+   * the geofence which is expired relative to the user time in the request.
+   * @member {array} [geometries] Lists the fence geometries that either fully
+   * contain the coordinate position or have an overlap with the searchBuffer
+   * around the fence.
+   * @member {array} [invalidPeriodGeofenceGeometryId] Lists of the geometry ID
+   * of the geofence which is in invalid period relative to the user time in
+   * the request.
+   * @member {boolean} [isEventPublished] True if at least one event is
+   * published to the Azure Maps event subscriber, false if no event is
+   * published to the Azure Maps event subscriber.
+   */
+  constructor() {
+  }
+
+  /**
+   * Defines the metadata of MapsGeofenceEventProperties
+   *
+   * @returns {object} metadata of MapsGeofenceEventProperties
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'MapsGeofenceEventProperties',
+      type: {
+        name: 'Composite',
+        className: 'MapsGeofenceEventProperties',
+        modelProperties: {
+          expiredGeofenceGeometryId: {
+            required: false,
+            serializedName: 'expiredGeofenceGeometryId',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'StringElementType',
+                  type: {
+                    name: 'String'
+                  }
+              }
+            }
+          },
+          geometries: {
+            required: false,
+            serializedName: 'geometries',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'MapsGeofenceGeometryElementType',
+                  type: {
+                    name: 'Composite',
+                    className: 'MapsGeofenceGeometry'
+                  }
+              }
+            }
+          },
+          invalidPeriodGeofenceGeometryId: {
+            required: false,
+            serializedName: 'invalidPeriodGeofenceGeometryId',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'StringElementType',
+                  type: {
+                    name: 'String'
+                  }
+              }
+            }
+          },
+          isEventPublished: {
+            required: false,
+            serializedName: 'isEventPublished',
+            type: {
+              name: 'Boolean'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = MapsGeofenceEventProperties;
diff --git a/lib/services/eventgrid/lib/models/mapsGeofenceExitedEventData.js b/lib/services/eventgrid/lib/models/mapsGeofenceExitedEventData.js
new file mode 100644
index 0000000000..5c7ce7ba07
--- /dev/null
+++ b/lib/services/eventgrid/lib/models/mapsGeofenceExitedEventData.js
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+const models = require('./index');
+
+/**
+ * Schema of the Data property of an EventGridEvent for a
+ * Microsoft.Maps.GeofenceExited event.
+ *
+ * @extends models['MapsGeofenceEventProperties']
+ */
+class MapsGeofenceExitedEventData extends models['MapsGeofenceEventProperties'] {
+  /**
+   * Create a MapsGeofenceExitedEventData.
+   */
+  constructor() {
+    super();
+  }
+
+  /**
+   * Defines the metadata of MapsGeofenceExitedEventData
+   *
+   * @returns {object} metadata of MapsGeofenceExitedEventData
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'MapsGeofenceExitedEventData',
+      type: {
+        name: 'Composite',
+        className: 'MapsGeofenceExitedEventData',
+        modelProperties: {
+          expiredGeofenceGeometryId: {
+            required: false,
+            serializedName: 'expiredGeofenceGeometryId',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'StringElementType',
+                  type: {
+                    name: 'String'
+                  }
+              }
+            }
+          },
+          geometries: {
+            required: false,
+            serializedName: 'geometries',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'MapsGeofenceGeometryElementType',
+                  type: {
+                    name: 'Composite',
+                    className: 'MapsGeofenceGeometry'
+                  }
+              }
+            }
+          },
+          invalidPeriodGeofenceGeometryId: {
+            required: false,
+            serializedName: 'invalidPeriodGeofenceGeometryId',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'StringElementType',
+                  type: {
+                    name: 'String'
+                  }
+              }
+            }
+          },
+          isEventPublished: {
+            required: false,
+            serializedName: 'isEventPublished',
+            type: {
+              name: 'Boolean'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = MapsGeofenceExitedEventData;
diff --git a/lib/services/eventgrid/lib/models/mapsGeofenceGeometry.js b/lib/services/eventgrid/lib/models/mapsGeofenceGeometry.js
new file mode 100644
index 0000000000..cf2cc880f1
--- /dev/null
+++ b/lib/services/eventgrid/lib/models/mapsGeofenceGeometry.js
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+/**
+ * The geofence geometry.
+ *
+ */
+class MapsGeofenceGeometry {
+  /**
+   * Create a MapsGeofenceGeometry.
+   * @member {string} [deviceId] ID of the device.
+   * @member {number} [distance] Distance from the coordinate to the closest
+   * border of the geofence. Positive means the coordinate is outside of the
+   * geofence. If the coordinate is outside of the geofence, but more than the
+   * value of searchBuffer away from the closest geofence border, then the
+   * value is 999. Negative means the coordinate is inside of the geofence. If
+   * the coordinate is inside the polygon, but more than the value of
+   * searchBuffer away from the closest geofencing border,then the value is
+   * -999. A value of 999 means that there is great confidence the coordinate
+   * is well outside the geofence. A value of -999 means that there is great
+   * confidence the coordinate is well within the geofence.
+   * @member {string} [geometryId] The unique ID for the geofence geometry.
+   * @member {number} [nearestLat] Latitude of the nearest point of the
+   * geometry.
+   * @member {number} [nearestLon] Longitude of the nearest point of the
+   * geometry.
+   * @member {string} [udId] The unique id returned from user upload service
+   * when uploading a geofence. Will not be included in geofencing post API.
+   */
+  constructor() {
+  }
+
+  /**
+   * Defines the metadata of MapsGeofenceGeometry
+   *
+   * @returns {object} metadata of MapsGeofenceGeometry
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'MapsGeofenceGeometry',
+      type: {
+        name: 'Composite',
+        className: 'MapsGeofenceGeometry',
+        modelProperties: {
+          deviceId: {
+            required: false,
+            serializedName: 'deviceId',
+            type: {
+              name: 'String'
+            }
+          },
+          distance: {
+            required: false,
+            serializedName: 'distance',
+            type: {
+              name: 'Number'
+            }
+          },
+          geometryId: {
+            required: false,
+            serializedName: 'geometryId',
+            type: {
+              name: 'String'
+            }
+          },
+          nearestLat: {
+            required: false,
+            serializedName: 'nearestLat',
+            type: {
+              name: 'Number'
+            }
+          },
+          nearestLon: {
+            required: false,
+            serializedName: 'nearestLon',
+            type: {
+              name: 'Number'
+            }
+          },
+          udId: {
+            required: false,
+            serializedName: 'udId',
+            type: {
+              name: 'String'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = MapsGeofenceGeometry;
diff --git a/lib/services/eventgrid/lib/models/mapsGeofenceResultEventData.js b/lib/services/eventgrid/lib/models/mapsGeofenceResultEventData.js
new file mode 100644
index 0000000000..6c0bd1bbdd
--- /dev/null
+++ b/lib/services/eventgrid/lib/models/mapsGeofenceResultEventData.js
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+const models = require('./index');
+
+/**
+ * Schema of the Data property of an EventGridEvent for a
+ * Microsoft.Maps.GeofenceResult event.
+ *
+ * @extends models['MapsGeofenceEventProperties']
+ */
+class MapsGeofenceResultEventData extends models['MapsGeofenceEventProperties'] {
+  /**
+   * Create a MapsGeofenceResultEventData.
+   */
+  constructor() {
+    super();
+  }
+
+  /**
+   * Defines the metadata of MapsGeofenceResultEventData
+   *
+   * @returns {object} metadata of MapsGeofenceResultEventData
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'MapsGeofenceResultEventData',
+      type: {
+        name: 'Composite',
+        className: 'MapsGeofenceResultEventData',
+        modelProperties: {
+          expiredGeofenceGeometryId: {
+            required: false,
+            serializedName: 'expiredGeofenceGeometryId',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'StringElementType',
+                  type: {
+                    name: 'String'
+                  }
+              }
+            }
+          },
+          geometries: {
+            required: false,
+            serializedName: 'geometries',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'MapsGeofenceGeometryElementType',
+                  type: {
+                    name: 'Composite',
+                    className: 'MapsGeofenceGeometry'
+                  }
+              }
+            }
+          },
+          invalidPeriodGeofenceGeometryId: {
+            required: false,
+            serializedName: 'invalidPeriodGeofenceGeometryId',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'StringElementType',
+                  type: {
+                    name: 'String'
+                  }
+              }
+            }
+          },
+          isEventPublished: {
+            required: false,
+            serializedName: 'isEventPublished',
+            type: {
+              name: 'Boolean'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = MapsGeofenceResultEventData;
diff --git a/lib/services/eventgrid/lib/models/mediaJobOutputProgressEventData.js b/lib/services/eventgrid/lib/models/mediaJobOutputProgressEventData.js
new file mode 100644
index 0000000000..66c38f6afb
--- /dev/null
+++ b/lib/services/eventgrid/lib/models/mediaJobOutputProgressEventData.js
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+/**
+ * Job Output Progress Event Data.
+ *
+ */
+class MediaJobOutputProgressEventData {
+  /**
+   * Create a MediaJobOutputProgressEventData.
+   * @member {string} [label] Gets the Job output label.
+   * @member {number} [progress] Gets the Job output progress.
+   * @member {object} [jobCorrelationData] Gets the Job correlation data.
+   */
+  constructor() {
+  }
+
+  /**
+   * Defines the metadata of MediaJobOutputProgressEventData
+   *
+   * @returns {object} metadata of MediaJobOutputProgressEventData
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: '#Microsoft.Media.JobOutputProgress',
+      type: {
+        name: 'Composite',
+        className: 'MediaJobOutputProgressEventData',
+        modelProperties: {
+          label: {
+            required: false,
+            serializedName: 'label',
+            type: {
+              name: 'String'
+            }
+          },
+          progress: {
+            required: false,
+            serializedName: 'progress',
+            type: {
+              name: 'Number'
+            }
+          },
+          jobCorrelationData: {
+            required: false,
+            serializedName: 'jobCorrelationData',
+            type: {
+              name: 'Dictionary',
+              value: {
+                  required: false,
+                  serializedName: 'StringElementType',
+                  type: {
+                    name: 'String'
+                  }
+              }
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = MediaJobOutputProgressEventData;
diff --git a/lib/services/eventgrid/lib/models/mediaLiveEventIncomingDataChunkDroppedEventData.js b/lib/services/eventgrid/lib/models/mediaLiveEventIncomingDataChunkDroppedEventData.js
index 84668146d4..9fc09c9baf 100644
--- a/lib/services/eventgrid/lib/models/mediaLiveEventIncomingDataChunkDroppedEventData.js
+++ b/lib/services/eventgrid/lib/models/mediaLiveEventIncomingDataChunkDroppedEventData.js
@@ -11,7 +11,7 @@
 'use strict';
 
 /**
- * Ingest fragment dropped event event data.
+ * Ingest fragment dropped event data.
  *
  */
 class MediaLiveEventIncomingDataChunkDroppedEventData {
diff --git a/lib/services/eventgrid/lib/models/mediaLiveEventIngestHeartbeatEventData.js b/lib/services/eventgrid/lib/models/mediaLiveEventIngestHeartbeatEventData.js
index 0fe6c51951..cfbf472eb8 100644
--- a/lib/services/eventgrid/lib/models/mediaLiveEventIngestHeartbeatEventData.js
+++ b/lib/services/eventgrid/lib/models/mediaLiveEventIngestHeartbeatEventData.js
@@ -11,7 +11,7 @@
 'use strict';
 
 /**
- * Ingest fragment dropped event event data.
+ * Ingest fragment dropped event data.
  *
  */
 class MediaLiveEventIngestHeartbeatEventData {