diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
index ead8e6ac656..3d7be668652 100755
--- a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
+++ b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -14327,40 +14327,36 @@
                              </xsd:appinfo>
                          </xsd:annotation>
                      </xsd:element>
-                     <xsd:choice>
-                         <xsd:element name="kind" type="tns:ShadowKindType" minOccurs="0" default="account">
-                             <xsd:annotation>
-                                 <xsd:documentation>
-                                     Kind of resource object that should be created on the resource.
-
-                                     This element is optional. If not specified defaults to account kind.
-                                 </xsd:documentation>
-                                 <xsd:appinfo>
-                                     <a:displayName>ConstructionType.kind</a:displayName>
-                                     <a:help>ConstructionType.kind.help</a:help>
-                                 </xsd:appinfo>
-                             </xsd:annotation>
-                         </xsd:element>
-                     </xsd:choice>
-                     <xsd:choice>
-                         <xsd:element name="intent" type="xsd:string" minOccurs="0">
-                             <xsd:annotation>
-                                 <xsd:documentation>
-                                     Intent of resource object that should be created on the resource.
-
-                                     This must point to the a valid definition in
-                                     the resource object (in schemaHandling section).
-
-                                     This element is optional. If not specified then the definition
-                                     marked as default in the resource definition should be used.
-                                 </xsd:documentation>
-                                 <xsd:appinfo>
-                                     <a:displayName>ConstructionType.intent</a:displayName>
-                                     <a:help>ConstructionType.intent.help</a:help>
-                                 </xsd:appinfo>
-                             </xsd:annotation>
-                         </xsd:element>
-                     </xsd:choice>
+                     <xsd:element name="kind" type="tns:ShadowKindType" minOccurs="0" default="account">
+                         <xsd:annotation>
+                             <xsd:documentation>
+                                 Kind of resource object that should be created on the resource.
+
+                                 This element is optional. If not specified defaults to account kind.
+                             </xsd:documentation>
+                             <xsd:appinfo>
+                                 <a:displayName>ConstructionType.kind</a:displayName>
+                                 <a:help>ConstructionType.kind.help</a:help>
+                             </xsd:appinfo>
+                         </xsd:annotation>
+                     </xsd:element>
+                     <xsd:element name="intent" type="xsd:string" minOccurs="0">
+                         <xsd:annotation>
+                             <xsd:documentation>
+                                 Intent of resource object that should be created on the resource.
+
+                                 This must point to the a valid definition in
+                                 the resource object (in schemaHandling section).
+
+                                 This element is optional. If not specified then the definition
+                                 marked as default in the resource definition should be used.
+                             </xsd:documentation>
+                             <xsd:appinfo>
+                                 <a:displayName>ConstructionType.intent</a:displayName>
+                                 <a:help>ConstructionType.intent.help</a:help>
+                             </xsd:appinfo>
+                         </xsd:annotation>
+                     </xsd:element>
                      <xsd:element name="attribute" type="tns:ResourceAttributeDefinitionType" minOccurs="0" maxOccurs="unbounded">
                          <xsd:annotation>
                              <xsd:documentation>