diff --git a/schema/bom-1.5.xsd b/schema/bom-1.5.xsd
index 0651bcdd..d7a17437 100644
--- a/schema/bom-1.5.xsd
+++ b/schema/bom-1.5.xsd
@@ -22,7 +22,7 @@ limitations under the License.
            targetNamespace="http://cyclonedx.org/schema/bom/1.5"
            vc:minVersion="1.0"
            vc:maxVersion="1.1"
-           version="1.5.0">
+           version="1.5.1">
 
     <xs:import namespace="http://cyclonedx.org/schema/spdx" schemaLocation="http://cyclonedx.org/schema/spdx"/>
 
@@ -2885,7 +2885,7 @@ limitations under the License.
                             </xs:annotation>
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="user" type="xs:string" minOccurs="0" maxOccurs="1" />
+                                    <xs:element name="user" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
@@ -2897,7 +2897,7 @@ limitations under the License.
                             </xs:annotation>
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="useCase" type="xs:string" minOccurs="0" maxOccurs="1" />
+                                    <xs:element name="useCase" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
@@ -2911,7 +2911,7 @@ limitations under the License.
                             </xs:annotation>
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="technicalLimitation" type="xs:string" minOccurs="0" maxOccurs="1" />
+                                    <xs:element name="technicalLimitation" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
@@ -2923,7 +2923,7 @@ limitations under the License.
                             </xs:annotation>
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="performanceTradeoff" type="xs:string" minOccurs="0" maxOccurs="1" />
+                                    <xs:element name="performanceTradeoff" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
diff --git a/schema/bom-1.6.xsd b/schema/bom-1.6.xsd
index f4d6eb37..5d53ef67 100644
--- a/schema/bom-1.6.xsd
+++ b/schema/bom-1.6.xsd
@@ -22,7 +22,7 @@ limitations under the License.
            targetNamespace="http://cyclonedx.org/schema/bom/1.6"
            vc:minVersion="1.0"
            vc:maxVersion="1.1"
-           version="1.6.1">
+           version="1.6.2">
 
     <xs:import namespace="http://cyclonedx.org/schema/spdx" schemaLocation="http://cyclonedx.org/schema/spdx"/>
 
@@ -3256,7 +3256,7 @@ limitations under the License.
                             </xs:annotation>
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="user" type="xs:string" minOccurs="0" maxOccurs="1" />
+                                    <xs:element name="user" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
@@ -3268,7 +3268,7 @@ limitations under the License.
                             </xs:annotation>
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="useCase" type="xs:string" minOccurs="0" maxOccurs="1" />
+                                    <xs:element name="useCase" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
@@ -3282,7 +3282,7 @@ limitations under the License.
                             </xs:annotation>
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="technicalLimitation" type="xs:string" minOccurs="0" maxOccurs="1" />
+                                    <xs:element name="technicalLimitation" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
@@ -3294,7 +3294,7 @@ limitations under the License.
                             </xs:annotation>
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="performanceTradeoff" type="xs:string" minOccurs="0" maxOccurs="1" />
+                                    <xs:element name="performanceTradeoff" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
diff --git a/schema/bom-1.7.xsd b/schema/bom-1.7.xsd
index 4549d6fd..dc6b3bb5 100644
--- a/schema/bom-1.7.xsd
+++ b/schema/bom-1.7.xsd
@@ -22,7 +22,7 @@ limitations under the License.
            targetNamespace="http://cyclonedx.org/schema/bom/1.7"
            vc:minVersion="1.0"
            vc:maxVersion="1.1"
-           version="1.7.0">
+           version="1.7.1">
 
     <xs:import namespace="http://cyclonedx.org/schema/spdx" schemaLocation="http://cyclonedx.org/schema/spdx"/>
 
@@ -3499,7 +3499,7 @@ limitations under the License.
                             </xs:annotation>
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="user" type="xs:string" minOccurs="0" maxOccurs="1" />
+                                    <xs:element name="user" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
@@ -3511,7 +3511,7 @@ limitations under the License.
                             </xs:annotation>
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="useCase" type="xs:string" minOccurs="0" maxOccurs="1" />
+                                    <xs:element name="useCase" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
@@ -3525,7 +3525,7 @@ limitations under the License.
                             </xs:annotation>
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="technicalLimitation" type="xs:string" minOccurs="0" maxOccurs="1" />
+                                    <xs:element name="technicalLimitation" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
@@ -3537,7 +3537,7 @@ limitations under the License.
                             </xs:annotation>
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="performanceTradeoff" type="xs:string" minOccurs="0" maxOccurs="1" />
+                                    <xs:element name="performanceTradeoff" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
diff --git a/tools/src/test/resources/1.5/valid-machine-learning-1.5.json b/tools/src/test/resources/1.5/valid-machine-learning-1.5.json
index 59dc3cee..e718ecf1 100644
--- a/tools/src/test/resources/1.5/valid-machine-learning-1.5.json
+++ b/tools/src/test/resources/1.5/valid-machine-learning-1.5.json
@@ -60,16 +60,20 @@
         },
         "considerations": {
           "users": [
-            "Who are the intended users of the model?"
+            "Who are the intended users of the model?",
+            "Data scientists and ML researchers"
           ],
           "useCases": [
-            "Who are the intended users of the model?"
+            "Who are the intended users of the model?",
+            "Text-to-image generation for creative applications"
           ],
           "technicalLimitations": [
-            "What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?"
+            "What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?",
+            "Limited performance on non-photographic styles"
           ],
           "performanceTradeoffs": [
-            "What are the known tradeoffs in accuracy/performance of the model?"
+            "What are the known tradeoffs in accuracy/performance of the model?",
+            "Higher resolution output requires more computational resources"
           ],
           "ethicalConsiderations": [
             {
diff --git a/tools/src/test/resources/1.5/valid-machine-learning-1.5.textproto b/tools/src/test/resources/1.5/valid-machine-learning-1.5.textproto
index 4e54321d..3d32ef41 100644
--- a/tools/src/test/resources/1.5/valid-machine-learning-1.5.textproto
+++ b/tools/src/test/resources/1.5/valid-machine-learning-1.5.textproto
@@ -48,9 +48,13 @@ components {
     }
     considerations: {
       users: "Who are the intended users of the model?"
+      users: "Data scientists and ML researchers"
       useCases: "Who are the intended users of the model?"
+      useCases: "Text-to-image generation for creative applications"
       technicalLimitations: "What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?"
+      technicalLimitations: "Limited performance on non-photographic styles"
       performanceTradeoffs: "What are the known tradeoffs in accuracy/performance of the model?"
+      performanceTradeoffs: "Higher resolution output requires more computational resources"
       ethicalConsiderations: {
         name: "The name of the risk"
         mitigationStrategy: "Strategy used to address this risk"
diff --git a/tools/src/test/resources/1.5/valid-machine-learning-1.5.xml b/tools/src/test/resources/1.5/valid-machine-learning-1.5.xml
index 7c541ecb..e4a871b8 100644
--- a/tools/src/test/resources/1.5/valid-machine-learning-1.5.xml
+++ b/tools/src/test/resources/1.5/valid-machine-learning-1.5.xml
@@ -61,15 +61,19 @@
                 <considerations>
                     <users>
                         <user>Who are the intended users of the model?</user>
+                        <user>Data scientists and ML researchers</user>
                     </users>
                     <useCases>
                         <useCase>Who are the intended users of the model?</useCase>
+                        <useCase>Text-to-image generation for creative applications</useCase>
                     </useCases>
                     <technicalLimitations>
                         <technicalLimitation>What are the known technical limitations of the model?</technicalLimitation>
+                        <technicalLimitation>Limited performance on non-photographic styles</technicalLimitation>
                     </technicalLimitations>
                     <performanceTradeoffs>
                         <performanceTradeoff>What are the known tradeoffs in accuracy/performance of the model?</performanceTradeoff>
+                        <performanceTradeoff>Higher resolution output requires more computational resources</performanceTradeoff>
                     </performanceTradeoffs>
                     <ethicalConsiderations>
                         <ethicalConsideration>
diff --git a/tools/src/test/resources/1.6/valid-machine-learning-1.6.json b/tools/src/test/resources/1.6/valid-machine-learning-1.6.json
index dbd0ea7b..a96c5e9c 100644
--- a/tools/src/test/resources/1.6/valid-machine-learning-1.6.json
+++ b/tools/src/test/resources/1.6/valid-machine-learning-1.6.json
@@ -62,16 +62,20 @@
         },
         "considerations": {
           "users": [
-            "Who are the intended users of the model?"
+            "Who are the intended users of the model?",
+            "Data scientists and ML researchers"
           ],
           "useCases": [
-            "Who are the intended users of the model?"
+            "Who are the intended users of the model?",
+            "Text-to-image generation for creative applications"
           ],
           "technicalLimitations": [
-            "What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?"
+            "What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?",
+            "Limited performance on non-photographic styles"
           ],
           "performanceTradeoffs": [
-            "What are the known tradeoffs in accuracy/performance of the model?"
+            "What are the known tradeoffs in accuracy/performance of the model?",
+            "Higher resolution output requires more computational resources"
           ],
           "ethicalConsiderations": [
             {
diff --git a/tools/src/test/resources/1.6/valid-machine-learning-1.6.textproto b/tools/src/test/resources/1.6/valid-machine-learning-1.6.textproto
index 54452d65..c4594c77 100644
--- a/tools/src/test/resources/1.6/valid-machine-learning-1.6.textproto
+++ b/tools/src/test/resources/1.6/valid-machine-learning-1.6.textproto
@@ -63,9 +63,13 @@ components {
     }
     considerations: {
       users: "Who are the intended users of the model?"
+      users: "Data scientists and ML researchers"
       useCases: "Who are the intended users of the model?"
+      useCases: "Text-to-image generation for creative applications"
       technicalLimitations: "What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?"
+      technicalLimitations: "Limited performance on non-photographic styles"
       performanceTradeoffs: "What are the known tradeoffs in accuracy/performance of the model?"
+      performanceTradeoffs: "Higher resolution output requires more computational resources"
       ethicalConsiderations: {
         name: "The name of the risk"
         mitigationStrategy: "Strategy used to address this risk"
diff --git a/tools/src/test/resources/1.6/valid-machine-learning-1.6.xml b/tools/src/test/resources/1.6/valid-machine-learning-1.6.xml
index 6013b1c3..808be3f5 100644
--- a/tools/src/test/resources/1.6/valid-machine-learning-1.6.xml
+++ b/tools/src/test/resources/1.6/valid-machine-learning-1.6.xml
@@ -61,15 +61,19 @@
                 <considerations>
                     <users>
                         <user>Who are the intended users of the model?</user>
+                        <user>Data scientists and ML researchers</user>
                     </users>
                     <useCases>
                         <useCase>Who are the intended users of the model?</useCase>
+                        <useCase>Text-to-image generation for creative applications</useCase>
                     </useCases>
                     <technicalLimitations>
                         <technicalLimitation>What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?</technicalLimitation>
+                        <technicalLimitation>Limited performance on non-photographic styles</technicalLimitation>
                     </technicalLimitations>
                     <performanceTradeoffs>
                         <performanceTradeoff>What are the known tradeoffs in accuracy/performance of the model?</performanceTradeoff>
+                        <performanceTradeoff>Higher resolution output requires more computational resources</performanceTradeoff>
                     </performanceTradeoffs>
                     <ethicalConsiderations>
                         <ethicalConsideration>
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-1.7.json b/tools/src/test/resources/1.7/valid-machine-learning-1.7.json
index cb64ee80..76117eb7 100644
--- a/tools/src/test/resources/1.7/valid-machine-learning-1.7.json
+++ b/tools/src/test/resources/1.7/valid-machine-learning-1.7.json
@@ -70,16 +70,20 @@
         },
         "considerations": {
           "users": [
-            "Who are the intended users of the model?"
+            "Who are the intended users of the model?",
+            "Data scientists and ML researchers"
           ],
           "useCases": [
-            "Who are the intended users of the model?"
+            "Who are the intended users of the model?",
+            "Text-to-image generation for creative applications"
           ],
           "technicalLimitations": [
-            "What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?"
+            "What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?",
+            "Limited performance on non-photographic styles"
           ],
           "performanceTradeoffs": [
-            "What are the known tradeoffs in accuracy/performance of the model?"
+            "What are the known tradeoffs in accuracy/performance of the model?",
+            "Higher resolution output requires more computational resources"
           ],
           "ethicalConsiderations": [
             {
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-1.7.textproto b/tools/src/test/resources/1.7/valid-machine-learning-1.7.textproto
index 25b78f5d..b76fe7a7 100644
--- a/tools/src/test/resources/1.7/valid-machine-learning-1.7.textproto
+++ b/tools/src/test/resources/1.7/valid-machine-learning-1.7.textproto
@@ -62,9 +62,13 @@ components: {
     }
     considerations: {
       users: "Who are the intended users of the model?"
+      users: "Data scientists and ML researchers"
       useCases: "Who are the intended users of the model?"
+      useCases: "Text-to-image generation for creative applications"
       technicalLimitations: "What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?"
+      technicalLimitations: "Limited performance on non-photographic styles"
       performanceTradeoffs: "What are the known tradeoffs in accuracy/performance of the model?"
+      performanceTradeoffs: "Higher resolution output requires more computational resources"
       ethicalConsiderations: {
         name: "The name of the risk"
         mitigationStrategy: "Strategy used to address this risk"
diff --git a/tools/src/test/resources/1.7/valid-machine-learning-1.7.xml b/tools/src/test/resources/1.7/valid-machine-learning-1.7.xml
index 38df43ff..c235c569 100644
--- a/tools/src/test/resources/1.7/valid-machine-learning-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-machine-learning-1.7.xml
@@ -63,15 +63,19 @@
                 <considerations>
                     <users>
                         <user>Who are the intended users of the model?</user>
+                        <user>Data scientists and ML researchers</user>
                     </users>
                     <useCases>
                         <useCase>Who are the intended users of the model?</useCase>
+                        <useCase>Text-to-image generation for creative applications</useCase>
                     </useCases>
                     <technicalLimitations>
                         <technicalLimitation>What are the known technical limitations of the model? E.g. What kind(s) of data should the model be expected not to perform well on? What are the factors that might degrade model performance?</technicalLimitation>
+                        <technicalLimitation>Limited performance on non-photographic styles</technicalLimitation>
                     </technicalLimitations>
                     <performanceTradeoffs>
                         <performanceTradeoff>What are the known tradeoffs in accuracy/performance of the model?</performanceTradeoff>
+                        <performanceTradeoff>Higher resolution output requires more computational resources</performanceTradeoff>
                     </performanceTradeoffs>
                     <ethicalConsiderations>
                         <ethicalConsideration>