diff --git a/vocabularies/Org.OData.Aggregation.V1.md b/vocabularies/Org.OData.Aggregation.V1.md
index b7503084..0af77e98 100644
--- a/vocabularies/Org.OData.Aggregation.V1.md
+++ b/vocabularies/Org.OData.Aggregation.V1.md
@@ -8,86 +8,86 @@ Terms to describe which data in a given entity model can be aggregated, and how.
 
 Term|Type|Description
 :---|:---|:----------
-[ApplySupported](./Org.OData.Aggregation.V1.xml#L74:~:text=<Term%20Name="-,ApplySupported,-")|[ApplySupportedType](#ApplySupportedType)|<a name="ApplySupported"></a>This entity set or collection supports the `$apply` system query option
-[ApplySupportedDefaults](./Org.OData.Aggregation.V1.xml#L80:~:text=<Term%20Name="-,ApplySupportedDefaults,-")|[ApplySupportedBase](#ApplySupportedBase)|<a name="ApplySupportedDefaults"></a>Default support of the `$apply` system query option for all collection-valued resources in the container<br>Annotating term [`ApplySupported`](#ApplySupported) for a specific collection-valued resource overrides the default support with the specified properties using PATCH semantics:<br/>- Primitive or collection-valued properties specified in `ApplySupported` replace the corresponding properties specified in `ApplySupportedDefaults`<br/>- Complex-valued properties specified in `ApplySupported` override the corresponding properties specified in `ApplySupportedDefaults` using PATCH semantics recursively<br/>- Properties specified neither in `ApplySupported` nor in `ApplySupportedDefaults` have their default value
-[Groupable](./Org.OData.Aggregation.V1.xml#L239:~:text=<Term%20Name="-,Groupable,-") *(Deprecated)*|[Tag](Org.OData.Core.V1.md#Tag)|<a name="Groupable"></a>Deprecated in favor of [`ApplySupported/GroupableProperties`](#ApplySupported)
-[Aggregatable](./Org.OData.Aggregation.V1.xml#L251:~:text=<Term%20Name="-,Aggregatable,-") *(Deprecated)*|[Tag](Org.OData.Core.V1.md#Tag)|<a name="Aggregatable"></a>Deprecated in favor of [`ApplySupported/AggregatableProperties`](#ApplySupported)
-[CustomAggregate](./Org.OData.Aggregation.V1.xml#L263:~:text=<Term%20Name="-,CustomAggregate,-")|String|<a name="CustomAggregate"></a>Dynamic property that can be used in the `aggregate` transformation<br>This term MUST be applied with a Qualifier, the Qualifier value is the name of the dynamic property. The value of the annotation MUST be the qualified name of a primitive type. The aggregated value will be of that type.
-[ContextDefiningProperties](./Org.OData.Aggregation.V1.xml#L269:~:text=<Term%20Name="-,ContextDefiningProperties,-")|\[PropertyPath\]|<a name="ContextDefiningProperties"></a>The annotated property or custom aggregate is only well-defined in the context of these properties<br>The context-defining properties need either be part of the result entities, or be restricted to a single value by a pre-filter operation. Examples are postal codes within a country, or monetary amounts whose context is the unit of currency.
-[LeveledHierarchy](./Org.OData.Aggregation.V1.xml#L276:~:text=<Term%20Name="-,LeveledHierarchy,-")|\[PropertyPath\]|<a name="LeveledHierarchy"></a>Defines a leveled hierarchy by defining an ordered list of properties in the hierarchy
-[RecursiveHierarchy](./Org.OData.Aggregation.V1.xml#L280:~:text=<Term%20Name="-,RecursiveHierarchy,-")|[RecursiveHierarchyType](#RecursiveHierarchyType)|<a name="RecursiveHierarchy"></a>Defines a recursive hierarchy.
-[AvailableOnAggregates](./Org.OData.Aggregation.V1.xml#L340:~:text=<Term%20Name="-,AvailableOnAggregates,-")|[AvailableOnAggregatesType](#AvailableOnAggregatesType)|<a name="AvailableOnAggregates"></a>This action or function is available on aggregated entities if the `RequiredProperties` are still defined
+[ApplySupported](./Org.OData.Aggregation.V1.xml#L76:~:text=<Term%20Name="-,ApplySupported,-")|[ApplySupportedType](#ApplySupportedType)|<a name="ApplySupported"></a>This entity set or collection supports the `$apply` system query option
+[ApplySupportedDefaults](./Org.OData.Aggregation.V1.xml#L82:~:text=<Term%20Name="-,ApplySupportedDefaults,-")|[ApplySupportedBase](#ApplySupportedBase)|<a name="ApplySupportedDefaults"></a>Default support of the `$apply` system query option for all collection-valued resources in the container<br>Annotating term [`ApplySupported`](#ApplySupported) for a specific collection-valued resource overrides the default support with the specified properties using PATCH semantics:<br/>- Primitive or collection-valued properties specified in `ApplySupported` replace the corresponding properties specified in `ApplySupportedDefaults`<br/>- Complex-valued properties specified in `ApplySupported` override the corresponding properties specified in `ApplySupportedDefaults` using PATCH semantics recursively<br/>- Properties specified neither in `ApplySupported` nor in `ApplySupportedDefaults` have their default value
+[Groupable](./Org.OData.Aggregation.V1.xml#L241:~:text=<Term%20Name="-,Groupable,-") *(Deprecated)*|[Tag](Org.OData.Core.V1.md#Tag)|<a name="Groupable"></a>Deprecated in favor of [`ApplySupported/GroupableProperties`](#ApplySupported)
+[Aggregatable](./Org.OData.Aggregation.V1.xml#L253:~:text=<Term%20Name="-,Aggregatable,-") *(Deprecated)*|[Tag](Org.OData.Core.V1.md#Tag)|<a name="Aggregatable"></a>Deprecated in favor of [`ApplySupported/AggregatableProperties`](#ApplySupported)
+[CustomAggregate](./Org.OData.Aggregation.V1.xml#L265:~:text=<Term%20Name="-,CustomAggregate,-")|String|<a name="CustomAggregate"></a>Dynamic property that can be used in the `aggregate` transformation<br>This term MUST be applied with a Qualifier, the Qualifier value is the name of the dynamic property. The value of the annotation MUST be the qualified name of a primitive type. The aggregated value will be of that type.
+[ContextDefiningProperties](./Org.OData.Aggregation.V1.xml#L271:~:text=<Term%20Name="-,ContextDefiningProperties,-")|\[PropertyPath\]|<a name="ContextDefiningProperties"></a>The annotated property or custom aggregate is only well-defined in the context of these properties<br>The context-defining properties need either be part of the result entities, or be restricted to a single value by a pre-filter operation. Examples are postal codes within a country, or monetary amounts whose context is the unit of currency.
+[LeveledHierarchy](./Org.OData.Aggregation.V1.xml#L278:~:text=<Term%20Name="-,LeveledHierarchy,-")|\[PropertyPath\]|<a name="LeveledHierarchy"></a>Defines a leveled hierarchy by defining an ordered list of properties in the hierarchy
+[RecursiveHierarchy](./Org.OData.Aggregation.V1.xml#L282:~:text=<Term%20Name="-,RecursiveHierarchy,-")|[RecursiveHierarchyType](#RecursiveHierarchyType)|<a name="RecursiveHierarchy"></a>Defines a recursive hierarchy.
+[AvailableOnAggregates](./Org.OData.Aggregation.V1.xml#L342:~:text=<Term%20Name="-,AvailableOnAggregates,-")|[AvailableOnAggregatesType](#AvailableOnAggregatesType)|<a name="AvailableOnAggregates"></a>This action or function is available on aggregated entities if the `RequiredProperties` are still defined
 
 
 ## Functions
 
 <a name="isroot"></a>
-### [isroot](./Org.OData.Aggregation.V1.xml#L300:~:text=<Function%20Name="-,isroot,-")
+### [isroot](./Org.OData.Aggregation.V1.xml#L302:~:text=<Function%20Name="-,isroot,-")
 
 Returns true, if and only if the value of the node property of the specified hierarchy is the root of the hierarchy
 
 Parameter|Type|Description
 :--------|:---|:----------
-**[Entity](./Org.OData.Aggregation.V1.xml#L302:~:text=<Function%20Name="-,isroot,-")**|EntityType|**Binding parameter**
-[Hierarchy](./Org.OData.Aggregation.V1.xml#L303:~:text=<Function%20Name="-,isroot,-")|String|
-[&rarr;](./Org.OData.Aggregation.V1.xml#L304:~:text=<Function%20Name="-,isroot,-")|Boolean|
+**[Entity](./Org.OData.Aggregation.V1.xml#L304:~:text=<Function%20Name="-,isroot,-")**|EntityType|**Binding parameter**
+[Hierarchy](./Org.OData.Aggregation.V1.xml#L305:~:text=<Function%20Name="-,isroot,-")|String|
+[&rarr;](./Org.OData.Aggregation.V1.xml#L306:~:text=<Function%20Name="-,isroot,-")|Boolean|
 
 
 <a name="isdescendant"></a>
-### [isdescendant](./Org.OData.Aggregation.V1.xml#L307:~:text=<Function%20Name="-,isdescendant,-")
+### [isdescendant](./Org.OData.Aggregation.V1.xml#L309:~:text=<Function%20Name="-,isdescendant,-")
 
 Returns true, if and only if the value of the node property of the specified hierarchy is a descendant of the given parent node with a distance of less than or equal to the optionally specified maximum distance
 
 Parameter|Type|Description
 :--------|:---|:----------
-**[Entity](./Org.OData.Aggregation.V1.xml#L309:~:text=<Function%20Name="-,isdescendant,-")**|EntityType|**Binding parameter**
-[Hierarchy](./Org.OData.Aggregation.V1.xml#L310:~:text=<Function%20Name="-,isdescendant,-")|String|
-[Node](./Org.OData.Aggregation.V1.xml#L311:~:text=<Function%20Name="-,isdescendant,-")|PrimitiveType|
-[MaxDistance](./Org.OData.Aggregation.V1.xml#L312:~:text=<Function%20Name="-,isdescendant,-")|Int16?|
-[&rarr;](./Org.OData.Aggregation.V1.xml#L313:~:text=<Function%20Name="-,isdescendant,-")|Boolean|
+**[Entity](./Org.OData.Aggregation.V1.xml#L311:~:text=<Function%20Name="-,isdescendant,-")**|EntityType|**Binding parameter**
+[Hierarchy](./Org.OData.Aggregation.V1.xml#L312:~:text=<Function%20Name="-,isdescendant,-")|String|
+[Node](./Org.OData.Aggregation.V1.xml#L313:~:text=<Function%20Name="-,isdescendant,-")|PrimitiveType|
+[MaxDistance](./Org.OData.Aggregation.V1.xml#L314:~:text=<Function%20Name="-,isdescendant,-")|Int16?|
+[&rarr;](./Org.OData.Aggregation.V1.xml#L315:~:text=<Function%20Name="-,isdescendant,-")|Boolean|
 
 
 <a name="isancestor"></a>
-### [isancestor](./Org.OData.Aggregation.V1.xml#L316:~:text=<Function%20Name="-,isancestor,-")
+### [isancestor](./Org.OData.Aggregation.V1.xml#L318:~:text=<Function%20Name="-,isancestor,-")
 
 Returns true, if and only if the value of the node property of the specified hierarchy is an ancestor of the given child node with a distance of less than or equal to the optionally specified maximum distance
 
 Parameter|Type|Description
 :--------|:---|:----------
-**[Entity](./Org.OData.Aggregation.V1.xml#L318:~:text=<Function%20Name="-,isancestor,-")**|EntityType|**Binding parameter**
-[Hierarchy](./Org.OData.Aggregation.V1.xml#L319:~:text=<Function%20Name="-,isancestor,-")|String|
-[Node](./Org.OData.Aggregation.V1.xml#L320:~:text=<Function%20Name="-,isancestor,-")|PrimitiveType|
-[MaxDistance](./Org.OData.Aggregation.V1.xml#L321:~:text=<Function%20Name="-,isancestor,-")|Int16?|
-[&rarr;](./Org.OData.Aggregation.V1.xml#L322:~:text=<Function%20Name="-,isancestor,-")|Boolean|
+**[Entity](./Org.OData.Aggregation.V1.xml#L320:~:text=<Function%20Name="-,isancestor,-")**|EntityType|**Binding parameter**
+[Hierarchy](./Org.OData.Aggregation.V1.xml#L321:~:text=<Function%20Name="-,isancestor,-")|String|
+[Node](./Org.OData.Aggregation.V1.xml#L322:~:text=<Function%20Name="-,isancestor,-")|PrimitiveType|
+[MaxDistance](./Org.OData.Aggregation.V1.xml#L323:~:text=<Function%20Name="-,isancestor,-")|Int16?|
+[&rarr;](./Org.OData.Aggregation.V1.xml#L324:~:text=<Function%20Name="-,isancestor,-")|Boolean|
 
 
 <a name="issibling"></a>
-### [issibling](./Org.OData.Aggregation.V1.xml#L325:~:text=<Function%20Name="-,issibling,-")
+### [issibling](./Org.OData.Aggregation.V1.xml#L327:~:text=<Function%20Name="-,issibling,-")
 
 Returns true, if and only if the value of the node property of the specified hierarchy has the same parent node as the specified node
 
 Parameter|Type|Description
 :--------|:---|:----------
-**[Entity](./Org.OData.Aggregation.V1.xml#L327:~:text=<Function%20Name="-,issibling,-")**|EntityType|**Binding parameter**
-[Hierarchy](./Org.OData.Aggregation.V1.xml#L328:~:text=<Function%20Name="-,issibling,-")|String|
-[Node](./Org.OData.Aggregation.V1.xml#L329:~:text=<Function%20Name="-,issibling,-")|PrimitiveType|
-[&rarr;](./Org.OData.Aggregation.V1.xml#L330:~:text=<Function%20Name="-,issibling,-")|Boolean|
+**[Entity](./Org.OData.Aggregation.V1.xml#L329:~:text=<Function%20Name="-,issibling,-")**|EntityType|**Binding parameter**
+[Hierarchy](./Org.OData.Aggregation.V1.xml#L330:~:text=<Function%20Name="-,issibling,-")|String|
+[Node](./Org.OData.Aggregation.V1.xml#L331:~:text=<Function%20Name="-,issibling,-")|PrimitiveType|
+[&rarr;](./Org.OData.Aggregation.V1.xml#L332:~:text=<Function%20Name="-,issibling,-")|Boolean|
 
 
 <a name="isleaf"></a>
-### [isleaf](./Org.OData.Aggregation.V1.xml#L333:~:text=<Function%20Name="-,isleaf,-")
+### [isleaf](./Org.OData.Aggregation.V1.xml#L335:~:text=<Function%20Name="-,isleaf,-")
 
 Returns true, if and only if the value of the node property of the specified hierarchy has no descendants
 
 Parameter|Type|Description
 :--------|:---|:----------
-**[Entity](./Org.OData.Aggregation.V1.xml#L335:~:text=<Function%20Name="-,isleaf,-")**|EntityType|**Binding parameter**
-[Hierarchy](./Org.OData.Aggregation.V1.xml#L336:~:text=<Function%20Name="-,isleaf,-")|String|
-[&rarr;](./Org.OData.Aggregation.V1.xml#L337:~:text=<Function%20Name="-,isleaf,-")|Boolean|
+**[Entity](./Org.OData.Aggregation.V1.xml#L337:~:text=<Function%20Name="-,isleaf,-")**|EntityType|**Binding parameter**
+[Hierarchy](./Org.OData.Aggregation.V1.xml#L338:~:text=<Function%20Name="-,isleaf,-")|String|
+[&rarr;](./Org.OData.Aggregation.V1.xml#L339:~:text=<Function%20Name="-,isleaf,-")|Boolean|
 
 
 <a name="ApplySupportedBase"></a>
-## [ApplySupportedBase](./Org.OData.Aggregation.V1.xml#L95:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")
+## [ApplySupportedBase](./Org.OData.Aggregation.V1.xml#L97:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")
 
 
 **Derived Types:**
@@ -95,35 +95,35 @@ Parameter|Type|Description
 
 Property|Type|Description
 :-------|:---|:----------
-[Transformations](./Org.OData.Aggregation.V1.xml#L96:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[String\]|Transformations that can be used in `$apply`
-[CustomAggregationMethods](./Org.OData.Aggregation.V1.xml#L145:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[String\]|Qualified names of custom aggregation methods that can be used in `aggregate(...with...)`
-[Rollup](./Org.OData.Aggregation.V1.xml#L148:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|[RollupType](#RollupType)|The service supports rollup hierarchies in a `groupby` transformation
+[Transformations](./Org.OData.Aggregation.V1.xml#L98:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[String\]|Transformations that can be used in `$apply`
+[CustomAggregationMethods](./Org.OData.Aggregation.V1.xml#L147:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[String\]|Qualified names of custom aggregation methods that can be used in `aggregate(...with...)`
+[Rollup](./Org.OData.Aggregation.V1.xml#L150:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|[RollupType](#RollupType)|The service supports rollup hierarchies in a `groupby` transformation
 
 <a name="ApplySupportedType"></a>
-## [ApplySupportedType](./Org.OData.Aggregation.V1.xml#L152:~:text=<ComplexType%20Name="-,ApplySupportedType,-"): [ApplySupportedBase](#ApplySupportedBase)
+## [ApplySupportedType](./Org.OData.Aggregation.V1.xml#L154:~:text=<ComplexType%20Name="-,ApplySupportedType,-"): [ApplySupportedBase](#ApplySupportedBase)
 
 
 Property|Type|Description
 :-------|:---|:----------
-[*Transformations*](./Org.OData.Aggregation.V1.xml#L96:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[String\]|Transformations that can be used in `$apply`
-[*CustomAggregationMethods*](./Org.OData.Aggregation.V1.xml#L145:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[String\]|Qualified names of custom aggregation methods that can be used in `aggregate(...with...)`
-[*Rollup*](./Org.OData.Aggregation.V1.xml#L148:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|[RollupType](#RollupType)|The service supports rollup hierarchies in a `groupby` transformation
-[PropertyRestrictions](./Org.OData.Aggregation.V1.xml#L153:~:text=<ComplexType%20Name="-,ApplySupportedType,-") *(Deprecated)*|Boolean|Deprecated since [`Groupable`](#Groupable) and [`Aggregatable`](#Aggregatable) are deprecated
-[GroupableProperties](./Org.OData.Aggregation.V1.xml#L164:~:text=<ComplexType%20Name="-,ApplySupportedType,-")|\[PropertyPath\]|A non-empty collection indicates that only the listed properties of the annotated target are supported by the `groupby` transformation
-[AggregatableProperties](./Org.OData.Aggregation.V1.xml#L167:~:text=<ComplexType%20Name="-,ApplySupportedType,-")|\[[AggregatablePropertyType](#AggregatablePropertyType)\]|A non-empty collection indicates that only the listed properties of the annotated target can be used in the `aggregate` transformation, optionally restricted to the specified aggregation methods
+[*Transformations*](./Org.OData.Aggregation.V1.xml#L98:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[String\]|Transformations that can be used in `$apply`
+[*CustomAggregationMethods*](./Org.OData.Aggregation.V1.xml#L147:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|\[String\]|Qualified names of custom aggregation methods that can be used in `aggregate(...with...)`
+[*Rollup*](./Org.OData.Aggregation.V1.xml#L150:~:text=<ComplexType%20Name="-,ApplySupportedBase,-")|[RollupType](#RollupType)|The service supports rollup hierarchies in a `groupby` transformation
+[PropertyRestrictions](./Org.OData.Aggregation.V1.xml#L155:~:text=<ComplexType%20Name="-,ApplySupportedType,-") *(Deprecated)*|Boolean|Deprecated since [`Groupable`](#Groupable) and [`Aggregatable`](#Aggregatable) are deprecated
+[GroupableProperties](./Org.OData.Aggregation.V1.xml#L166:~:text=<ComplexType%20Name="-,ApplySupportedType,-")|\[PropertyPath\]|A non-empty collection indicates that only the listed properties of the annotated target are supported by the `groupby` transformation
+[AggregatableProperties](./Org.OData.Aggregation.V1.xml#L169:~:text=<ComplexType%20Name="-,ApplySupportedType,-")|\[[AggregatablePropertyType](#AggregatablePropertyType)\]|A non-empty collection indicates that only the listed properties of the annotated target can be used in the `aggregate` transformation, optionally restricted to the specified aggregation methods
 
 <a name="AggregatablePropertyType"></a>
-## [AggregatablePropertyType](./Org.OData.Aggregation.V1.xml#L171:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")
+## [AggregatablePropertyType](./Org.OData.Aggregation.V1.xml#L173:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")
 
 
 Property|Type|Description
 :-------|:---|:----------
-[Property](./Org.OData.Aggregation.V1.xml#L172:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")|PropertyPath|Aggregatable property
-[SupportedAggregationMethods](./Org.OData.Aggregation.V1.xml#L177:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")|\[[AggregationMethod](#AggregationMethod)\]|Standard and custom aggregation methods that can be applied to the property. If omitted, all aggregation methods can be applied
-[RecommendedAggregationMethod](./Org.OData.Aggregation.V1.xml#L182:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")|[AggregationMethod?](#AggregationMethod)|Recommended method for aggregating values of the property
+[Property](./Org.OData.Aggregation.V1.xml#L174:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")|PropertyPath|Aggregatable property
+[SupportedAggregationMethods](./Org.OData.Aggregation.V1.xml#L179:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")|\[[AggregationMethod](#AggregationMethod)\]|Standard and custom aggregation methods that can be applied to the property. If omitted, all aggregation methods can be applied
+[RecommendedAggregationMethod](./Org.OData.Aggregation.V1.xml#L184:~:text=<ComplexType%20Name="-,AggregatablePropertyType,-")|[AggregationMethod?](#AggregationMethod)|Recommended method for aggregating values of the property
 
 <a name="AggregationMethod"></a>
-## [AggregationMethod](./Org.OData.Aggregation.V1.xml#L189:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")
+## [AggregationMethod](./Org.OData.Aggregation.V1.xml#L191:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")
 **Type:** String
 
 Standard or custom aggregation method
@@ -132,45 +132,45 @@ Custom aggregation methods MUST use a namespace-qualified name, that is contain
 
 Allowed Value|Description
 :------------|:----------
-[sum](./Org.OData.Aggregation.V1.xml#L198:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to numeric values to return the sum of the non-null values, or null if there are no non-null values or the input set is empty
-[min](./Org.OData.Aggregation.V1.xml#L202:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to values with a totally ordered domain to return the smallest of the non-null values, or null if there are no non-null values or the input set is empty
-[max](./Org.OData.Aggregation.V1.xml#L206:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to values with a totally ordered domain to return the largest of the non-null values, or null if there are no non-null values or the input set is empty
-[average](./Org.OData.Aggregation.V1.xml#L210:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to numeric values to return the sum of the non-null values divided by the count of the non-null values, or null if there are no non-null values or the input set is empty
-[countdistinct](./Org.OData.Aggregation.V1.xml#L214:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Counts the distinct values, omitting any null values<br>For navigation properties, it counts the distinct entities in the union of all entities related to entities in the input set. For collection-valued primitive properties, it counts the distinct items in the union of all collection values in the input set.
+[sum](./Org.OData.Aggregation.V1.xml#L200:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to numeric values to return the sum of the non-null values, or null if there are no non-null values or the input set is empty
+[min](./Org.OData.Aggregation.V1.xml#L204:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to values with a totally ordered domain to return the smallest of the non-null values, or null if there are no non-null values or the input set is empty
+[max](./Org.OData.Aggregation.V1.xml#L208:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to values with a totally ordered domain to return the largest of the non-null values, or null if there are no non-null values or the input set is empty
+[average](./Org.OData.Aggregation.V1.xml#L212:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Can be applied to numeric values to return the sum of the non-null values divided by the count of the non-null values, or null if there are no non-null values or the input set is empty
+[countdistinct](./Org.OData.Aggregation.V1.xml#L216:~:text=<TypeDefinition%20Name="-,AggregationMethod,-")|Counts the distinct values, omitting any null values<br>For navigation properties, it counts the distinct entities in the union of all entities related to entities in the input set. For collection-valued primitive properties, it counts the distinct items in the union of all collection values in the input set.
 
 <a name="RollupType"></a>
-## [RollupType](./Org.OData.Aggregation.V1.xml#L226:~:text=<EnumType%20Name="-,RollupType,-")
+## [RollupType](./Org.OData.Aggregation.V1.xml#L228:~:text=<EnumType%20Name="-,RollupType,-")
 The number of `rollup` or `rollupall` operators allowed in a `groupby` transformation
 
 Member|Value|Description
 :-----|----:|:----------
-[None](./Org.OData.Aggregation.V1.xml#L228:~:text=<EnumType%20Name="-,RollupType,-")|0|No support for `rollup` or `rollupall`
-[SingleHierarchy](./Org.OData.Aggregation.V1.xml#L231:~:text=<EnumType%20Name="-,RollupType,-")|1|Only one `rollup` or `rollupall` operator per `groupby`
-[MultipleHierarchies](./Org.OData.Aggregation.V1.xml#L234:~:text=<EnumType%20Name="-,RollupType,-")|2|Full support for `rollup` and `rollupall`
+[None](./Org.OData.Aggregation.V1.xml#L230:~:text=<EnumType%20Name="-,RollupType,-")|0|No support for `rollup` or `rollupall`
+[SingleHierarchy](./Org.OData.Aggregation.V1.xml#L233:~:text=<EnumType%20Name="-,RollupType,-")|1|Only one `rollup` or `rollupall` operator per `groupby`
+[MultipleHierarchies](./Org.OData.Aggregation.V1.xml#L236:~:text=<EnumType%20Name="-,RollupType,-")|2|Full support for `rollup` and `rollupall`
 
 <a name="RecursiveHierarchyType"></a>
-## [RecursiveHierarchyType](./Org.OData.Aggregation.V1.xml#L284:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")
+## [RecursiveHierarchyType](./Org.OData.Aggregation.V1.xml#L286:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")
 
 
 Property|Type|Description
 :-------|:---|:----------
-[NodeProperty](./Org.OData.Aggregation.V1.xml#L285:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")|PropertyPath|Property holding the hierarchy node value
-[ParentNavigationProperty](./Org.OData.Aggregation.V1.xml#L288:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")|NavigationPropertyPath|Property for navigating to the parent node
-[DistanceFromRootProperty](./Org.OData.Aggregation.V1.xml#L291:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")|PropertyPath?|Property holding the number of edges between the node and the root node
-[IsLeafProperty](./Org.OData.Aggregation.V1.xml#L294:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")|PropertyPath?|Property indicating whether the node is a leaf of the hierarchy
+[NodeProperty](./Org.OData.Aggregation.V1.xml#L287:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")|PropertyPath|Property holding the hierarchy node value
+[ParentNavigationProperty](./Org.OData.Aggregation.V1.xml#L290:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")|NavigationPropertyPath|Property for navigating to the parent node
+[DistanceFromRootProperty](./Org.OData.Aggregation.V1.xml#L293:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")|PropertyPath?|Property holding the number of edges between the node and the root node
+[IsLeafProperty](./Org.OData.Aggregation.V1.xml#L296:~:text=<ComplexType%20Name="-,RecursiveHierarchyType,-")|PropertyPath?|Property indicating whether the node is a leaf of the hierarchy
 
 <a name="AvailableOnAggregatesType"></a>
-## [AvailableOnAggregatesType](./Org.OData.Aggregation.V1.xml#L343:~:text=<ComplexType%20Name="-,AvailableOnAggregatesType,-")
+## [AvailableOnAggregatesType](./Org.OData.Aggregation.V1.xml#L345:~:text=<ComplexType%20Name="-,AvailableOnAggregatesType,-")
 
 
 Property|Type|Description
 :-------|:---|:----------
-[RequiredProperties](./Org.OData.Aggregation.V1.xml#L344:~:text=<ComplexType%20Name="-,AvailableOnAggregatesType,-")|\[PropertyPath\]|Properties required to apply this action or function
+[RequiredProperties](./Org.OData.Aggregation.V1.xml#L346:~:text=<ComplexType%20Name="-,AvailableOnAggregatesType,-")|\[PropertyPath\]|Properties required to apply this action or function
 
 <a name="NavigationPropertyAggregationCapabilities"></a>
-## [NavigationPropertyAggregationCapabilities](./Org.OData.Aggregation.V1.xml#L349:~:text=<ComplexType%20Name="-,NavigationPropertyAggregationCapabilities,-"): [NavigationPropertyRestriction](Org.OData.Capabilities.V1.md#NavigationPropertyRestriction) *(Deprecated)*
+## [NavigationPropertyAggregationCapabilities](./Org.OData.Aggregation.V1.xml#L351:~:text=<ComplexType%20Name="-,NavigationPropertyAggregationCapabilities,-"): [NavigationPropertyRestriction](Org.OData.Capabilities.V1.md#NavigationPropertyRestriction) *(Deprecated)*
 [`Capabilities.NavigationRestrictions`](Org.OData.Capabilities.V1.md#NavigationRestrictions) that make use of the additional properties in this subtype are deprecated in favor of [`ApplySupported`](#ApplySupported) and [`CustomAggregate`](#CustomAggregate)
 
 <a name="CustomAggregateType"></a>
-## [CustomAggregateType](./Org.OData.Aggregation.V1.xml#L367:~:text=<ComplexType%20Name="-,CustomAggregateType,-") *(Deprecated)*
+## [CustomAggregateType](./Org.OData.Aggregation.V1.xml#L369:~:text=<ComplexType%20Name="-,CustomAggregateType,-") *(Deprecated)*
 Deprecated since [`NavigationPropertyAggregationCapabilities`](#NavigationPropertyAggregationCapabilities) is also deprecated
diff --git a/vocabularies/Org.OData.Aggregation.V1.xml b/vocabularies/Org.OData.Aggregation.V1.xml
index 2f1b7a6f..2d032147 100644
--- a/vocabularies/Org.OData.Aggregation.V1.xml
+++ b/vocabularies/Org.OData.Aggregation.V1.xml
@@ -7,13 +7,15 @@
 
   Chairs:
   - Ralf Handl (ralf.handl@sap.com), SAP SE
-  - Ram Jeyaraman (Ram.Jeyaraman@microsoft.com), Microsoft
+  - Michael Pizzo (mikep@microsoft.com), Microsoft
 
   Editors:
   - Ralf Handl (ralf.handl@sap.com), SAP SE
-  - Ram Jeyaraman (Ram.Jeyaraman@microsoft.com), Microsoft
+  - Hubert Heijkers (hubert.heijkers@nl.ibm.com), IBM
   - Gerald Krause (gerald.krause@sap.com), SAP SE
   - Michael Pizzo (mikep@microsoft.com), Microsoft
+  - Heiko Theißen (heiko.theissen@sap.com), SAP SE
+  - Martin Zurmuehl (martin.zurmuehl@sap.com), SAP SE
 
   Additional artifacts:
   This vocabulary is one component of a Work Product that also includes the following vocabulary components: