diff --git a/.gencode_hash.txt b/.gencode_hash.txt
index eb4c48a5c4..bf9b306397 100644
--- a/.gencode_hash.txt
+++ b/.gencode_hash.txt
@@ -1,10 +1,10 @@
-9646ce55996c521d600a6e803ce46fa4031a05a6ae15fce813bdb7f3999477bb  gencode/docs/config.html
+68d980d671aff90933b2cedc119625bd1c538bfdfb31894ef7796fd12c1a2755  gencode/docs/config.html
 e2944b13db5ff06be9caea51d03bca48f2cb093a8bb583dca14051255d34ea6b  gencode/docs/envelope.html
 ffe3ff971a425218e7601a205a2e37c629f9dbdc4a15e0c7856ed24a0114eac0  gencode/docs/event_discovery.html
 8133e380e40f27c56accbffc665b2eeb56ec84a4da3b52ba7aa5e439c9c40572  gencode/docs/event_pointset.html
 076eb51e75281ed065a9f0236a1e19b6bf3c277b51ceca84f6aa3f76d5bb6022  gencode/docs/event_system.html
 a82821e72af6d0ee35800e6262eb9bb05256309b98aed2dad1a368fd2d6882bb  gencode/docs/index.html
-f1731b2db4d6383fb9a96d931c461560ed681498428e4ae6b9e0f1ed9feb18de  gencode/docs/metadata.html
+7b1f7a81a7b337fdf7041b9b0fe4fca3cad6d793122d249a577c2193f2931cce  gencode/docs/metadata.html
 741b880216be3743f6747800a042f2dbd89f3b0344c6b0a965f4bc010f03a930  gencode/docs/schema_doc.css
 878ea88206c974f40643c3cc430875f9c4e8c5e3fd6bcd6358bd3eb6d48699a9  gencode/docs/schema_doc.min.js
 7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a  gencode/docs/schema_extras.js
@@ -44,13 +44,13 @@ a5e5adfc187709e8646a11c92e804acfb67743f9d72149008aaca954df3177f6  gencode/java/u
 a4e8f69100ab678a8236f481c558d677bbaea3e76c853bbd9262113d2a9c031d  gencode/java/udmi/schema/Metrics.java
 5e1c5411fae4d7c47391ceb5d19ae864fcd484df75ac6b6db39fd2d12647dec8  gencode/java/udmi/schema/Physical_tag.java
 0868f0a9beb671dd08f066e7e7e796531fe151307a0b853b1f1a1aafe50ee746  gencode/java/udmi/schema/PointEnumerationEvent.java
-2cca321fb2fbc00d2082fd918062f6b02e8f2dbe1359c0fbb6a3f47a946838c7  gencode/java/udmi/schema/PointPointsetConfig.java
+9855400da64cb7c9501294b72d0190caa646fab043b39a6c7c5e4b0250515f20  gencode/java/udmi/schema/PointPointsetConfig.java
 8f3fc1cdc2dcd3e524863f4675aebabc450a35f5fd1cdc3fd37289b5cab7f2ec  gencode/java/udmi/schema/PointPointsetEvent.java
-1372dc65268324a65a5854008b5dc5d2492328c145799dc4fda2a520e9f8198b  gencode/java/udmi/schema/PointPointsetModel.java
+65337109653a93d873dae40eb517857149bae1b20c7b479f41b35c0822d94ba0  gencode/java/udmi/schema/PointPointsetModel.java
 db8d6dd3498019ad12e0f328b6237d07e52f133f8b08858b712611a52c198009  gencode/java/udmi/schema/PointPointsetState.java
 c6a0571e228490defcb8fba335220b23247aea0e0cb9b657efc1e1e6dbcc0fb3  gencode/java/udmi/schema/PointsetConfig.java
 bb1c7e0df78870b7f7bd78fdfb1ed115cb121613ffcd98ec6b95e41c01624d41  gencode/java/udmi/schema/PointsetEvent.java
-580dd48ce15879fcedf2150e9b87de99c3b6bdf3b631372b1391af048ba6771f  gencode/java/udmi/schema/PointsetModel.java
+70bfd40c5aeb7b15fa3a7adb11042342b92d218c5117e84513ff0586eb3816ea  gencode/java/udmi/schema/PointsetModel.java
 fc3a9415c04d8a06954dbdbfdff5d68ab113cce3948532c19df555778ffb04fa  gencode/java/udmi/schema/PointsetState.java
 ca2e7566106818ca7e5190c8041eb86f0c9b3251b0bda8c3ea7ce11a0c891a0a  gencode/java/udmi/schema/Position.java
 3df66bb1a37a9e0b2b6cf392f8c64d404a73c83e5e13c02bb4844f09b9a04b70  gencode/java/udmi/schema/Properties.java
@@ -61,7 +61,7 @@ abe99dd74122c186403baa6982300a9d5968f8bbb7a67b1689104111b98f32fb  gencode/java/u
 580df660dad1b97399002271716d597f72aa1a6110a49de9e162104c231752f4  gencode/java/udmi/schema/State.java
 6b8b054c5fa2baef5163d42cd6bf1b0aeb4d07aa881529d81f4ae7dfa4c2906e  gencode/java/udmi/schema/SystemConfig.java
 247652dd11714452adc27ffa542e3d5915f8e9b7b255d181723d6fe1e897b565  gencode/java/udmi/schema/SystemEvent.java
-9cad2475189fa1115ca78978cbacaeac62fcb875494d72efa4bc40781e8072f9  gencode/java/udmi/schema/SystemModel.java
+1c79bdb3da4c9127c75aa6660be0e62bfab1d1ee47c289637662fee2e37f1491  gencode/java/udmi/schema/SystemModel.java
 6d4334b92e374ff096b90fcb4378cbc91b9c11a1eb238312a3e4b65d4aa01fe3  gencode/java/udmi/schema/SystemState.java
 dfe4bb7c9ba6e366a967ff475883a8ff33fc558ae51db5c71fafae2323d0f8eb  gencode/java/udmi/schema/Target.java
 7d6dd13e368e7f073738fee69c15e18652a9b7d7ac63bde0a200f747e3aa1b1d  gencode/java/udmi/schema/TargetTestingModel.java
@@ -77,7 +77,7 @@ a5edb9ac5ecd5a4459f93ce613691735f299f35718f2e35410206fc91c263dd1  gencode/python
 b461bdc24310ef972faf579b5be577b5af67fb0977d6afb4c42955211b26e3d5  gencode/python/udmi/schema/config_gateway.py
 573573ad49760e95ed140c7ff76dd7884aee3c47145f635c7b9e5b8c940dddcb  gencode/python/udmi/schema/config_localnet.py
 9eab64849e04b25203d5da47856c3f8dda2b96903e4dc43ab932ee35014700bd  gencode/python/udmi/schema/config_pointset.py
-3f23e78163fdc4a2638b2691fdf3f45f1547e8f9b605073339b16e76d894d401  gencode/python/udmi/schema/config_pointset_point.py
+607c5047df878a1333df3ce88dcce34668959b0b315f6954bf1a4963dcf7839e  gencode/python/udmi/schema/config_pointset_point.py
 1c178f298884d66c72b295319f3e29b4178b0eaf5201aebd93ba80699e7466d5  gencode/python/udmi/schema/config_system.py
 631371489cb1275517bebcc4040cbc655d18ca147ab540701b3fd9cedba138c5  gencode/python/udmi/schema/envelope.py
 1eb9019b9d0b4ff7de2df8beb625a4f89292d636ece0c02f160495c537bd6c2c  gencode/python/udmi/schema/event.py
@@ -96,9 +96,9 @@ b2227a48f21594f78c07c427de64e7ce51dc0ecd4b8091601d739a5f5038a2c9  gencode/python
 9416018a6d01094ab7af77c35ae4e5e2271a5d52c3bd3e381a541650415048b2  gencode/python/udmi/schema/model_gateway.py
 ae6a7bc93b520cdc90cd158f876a58e98a3e000402ebb1ca632f01ee492d408a  gencode/python/udmi/schema/model_localnet.py
 4718368765cacc2cbf552a65346452a14690d0175e9cc921fc576a5c7691fa1d  gencode/python/udmi/schema/model_localnet_family.py
-2b68c4bdc6d512d12881c1e3ad1d1d31e8422a120f71f3b55abd7c3045ff91ba  gencode/python/udmi/schema/model_pointset.py
-7125a56680e83c874a35caa6c26f0aa0127fa7a3990aef198090af133d109eab  gencode/python/udmi/schema/model_pointset_point.py
-75832b261c613b963012b96c406d7e7d22d12aab4f5ad649a5d9d1dd28235345  gencode/python/udmi/schema/model_system.py
+abe431dc7702c80992b2c9736ab924d80d1033493036976f0cefa8c2108227be  gencode/python/udmi/schema/model_pointset.py
+1ad65c005d865b9259bfa239b2dc4cd1cde13d312ecbc7843bb61cc31d6cabde  gencode/python/udmi/schema/model_pointset_point.py
+03a268cdd2644d0b1a491691b482836df5b68cf9d21508ad3480d6db9cc84333  gencode/python/udmi/schema/model_system.py
 aafe6e70c281152db958adf77a024e3e9fab8293927106297c5ec48c11f54e27  gencode/python/udmi/schema/model_testing.py
 5c50847e136a033ea511209238bb570499b43fbee6189dae06603132dcb9f01f  gencode/python/udmi/schema/model_testing_target.py
 a58f8c98e837a5b56126ca0f410e02f1e9cfcd80a8cb429e0ef522defab1f690  gencode/python/udmi/schema/properties.py
diff --git a/gencode/docs/config.html b/gencode/docs/config.html
index 5a1eadc019..c3fb5e86cd 100644
--- a/gencode/docs/config.html
+++ b/gencode/docs/config.html
@@ -1897,171 +1897,6 @@ <h2 class="mb-0">
         </div>
     </div>
 </div>
-<div class="accordion" id="accordionpointset_points_pattern1_min_loglevel">
-    <div class="card">
-        <div class="card-header" id="headingpointset_points_pattern1_min_loglevel">
-            <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#pointset_points_pattern1_min_loglevel"
-                        aria-expanded="" aria-controls="pointset_points_pattern1_min_loglevel" onclick="setAnchor('#pointset_points_pattern1_min_loglevel')"><span class="property-name">min_loglevel</span></button>
-            </h2>
-        </div>
-
-        <div id="pointset_points_pattern1_min_loglevel"
-             class="collapse property-definition-div" aria-labelledby="headingpointset_points_pattern1_min_loglevel"
-             data-parent="#accordionpointset_points_pattern1_min_loglevel">
-            <div class="card-body pl-5">
-
-    <div class="breadcrumbs">root
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset" onclick="anchorLink('pointset')">pointset</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points" onclick="anchorLink('pointset_points')">points</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points_pattern1" onclick="anchorLink('pointset_points_pattern1')">Point Pointset Config</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points_pattern1_min_loglevel" onclick="anchorLink('pointset_points_pattern1_min_loglevel')">min_loglevel</a></div><span class="badge badge-dark value-type">Type: integer</span><br/>
-<span class="description"><p>The minimum loglevel for reporting log messages below which log entries should not be sent. Default to 300.</p>
-</span>
-            
-
-            
-            <p><span class="badge badge-light restriction numeric-restriction" id="pointset_points_pattern1_min_loglevel_number">Value must be greater or equal to <code>100</code> and lesser or equal to <code>800</code></span></p>
-
-            
-            </div>
-        </div>
-    </div>
-</div>
-<div class="accordion" id="accordionpointset_points_pattern1_sample_limit_sec">
-    <div class="card">
-        <div class="card-header" id="headingpointset_points_pattern1_sample_limit_sec">
-            <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#pointset_points_pattern1_sample_limit_sec"
-                        aria-expanded="" aria-controls="pointset_points_pattern1_sample_limit_sec" onclick="setAnchor('#pointset_points_pattern1_sample_limit_sec')"><span class="property-name">sample_limit_sec</span></button>
-            </h2>
-        </div>
-
-        <div id="pointset_points_pattern1_sample_limit_sec"
-             class="collapse property-definition-div" aria-labelledby="headingpointset_points_pattern1_sample_limit_sec"
-             data-parent="#accordionpointset_points_pattern1_sample_limit_sec">
-            <div class="card-body pl-5">
-
-    <div class="breadcrumbs">root
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset" onclick="anchorLink('pointset')">pointset</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points" onclick="anchorLink('pointset_points')">points</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points_pattern1" onclick="anchorLink('pointset_points_pattern1')">Point Pointset Config</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points_pattern1_sample_limit_sec" onclick="anchorLink('pointset_points_pattern1_sample_limit_sec')">sample_limit_sec</a></div><span class="badge badge-dark value-type">Type: integer</span><br/>
-<span class="description"><p>Minimum time between sample updates for the device (including complete and COV updates). Updates more frequent than this should be coalesced into one update.</p>
-</span>
-            
-
-            
-            <p><span class="badge badge-light restriction numeric-restriction" id="pointset_points_pattern1_sample_limit_sec_number">Value must be greater or equal to <code>0</code> and lesser or equal to <code>86400</code></span></p>
-
-            
-            </div>
-        </div>
-    </div>
-</div>
-<div class="accordion" id="accordionpointset_points_pattern1_sample_rate_sec">
-    <div class="card">
-        <div class="card-header" id="headingpointset_points_pattern1_sample_rate_sec">
-            <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#pointset_points_pattern1_sample_rate_sec"
-                        aria-expanded="" aria-controls="pointset_points_pattern1_sample_rate_sec" onclick="setAnchor('#pointset_points_pattern1_sample_rate_sec')"><span class="property-name">sample_rate_sec</span></button>
-            </h2>
-        </div>
-
-        <div id="pointset_points_pattern1_sample_rate_sec"
-             class="collapse property-definition-div" aria-labelledby="headingpointset_points_pattern1_sample_rate_sec"
-             data-parent="#accordionpointset_points_pattern1_sample_rate_sec">
-            <div class="card-body pl-5">
-
-    <div class="breadcrumbs">root
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset" onclick="anchorLink('pointset')">pointset</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points" onclick="anchorLink('pointset_points')">points</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points_pattern1" onclick="anchorLink('pointset_points_pattern1')">Point Pointset Config</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points_pattern1_sample_rate_sec" onclick="anchorLink('pointset_points_pattern1_sample_rate_sec')">sample_rate_sec</a></div><span class="badge badge-dark value-type">Type: integer</span><br/>
-<span class="description"><p>Maximum time between samples for the device to send out a complete update. It can send out updates more frequently than this. Default to 600.</p>
-</span>
-            
-
-            
-            <p><span class="badge badge-light restriction numeric-restriction" id="pointset_points_pattern1_sample_rate_sec_number">Value must be greater or equal to <code>1</code> and lesser or equal to <code>86400</code></span></p>
-
-            
-            </div>
-        </div>
-    </div>
-</div>
             </div>
         </div>
     </div>
diff --git a/gencode/docs/metadata.html b/gencode/docs/metadata.html
index eb0e29d776..cabb45b072 100644
--- a/gencode/docs/metadata.html
+++ b/gencode/docs/metadata.html
@@ -1052,6 +1052,47 @@ <h2 class="mb-0">
         </div>
     </div>
 </div>
+<div class="accordion" id="accordionsystem_min_loglevel">
+    <div class="card">
+        <div class="card-header" id="headingsystem_min_loglevel">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#system_min_loglevel"
+                        aria-expanded="" aria-controls="system_min_loglevel" onclick="setAnchor('#system_min_loglevel')"><span class="property-name">min_loglevel</span></button>
+            </h2>
+        </div>
+
+        <div id="system_min_loglevel"
+             class="collapse property-definition-div" aria-labelledby="headingsystem_min_loglevel"
+             data-parent="#accordionsystem_min_loglevel">
+            <div class="card-body pl-5">
+
+    <div class="breadcrumbs">root
+        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <path
+                fill-rule="evenodd"
+                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
+            />
+        </svg>
+    <a href="#system" onclick="anchorLink('system')">system</a>
+        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <path
+                fill-rule="evenodd"
+                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
+            />
+        </svg>
+    <a href="#system_min_loglevel" onclick="anchorLink('system_min_loglevel')">min_loglevel</a></div><span class="badge badge-dark value-type">Type: integer</span> <span class="badge badge-success default-value">Default: 300</span><br/>
+<span class="description"><p>The minimum loglevel for reporting log messages below which log entries should not be sent. Default to 300.</p>
+</span>
+            
+
+            
+            <p><span class="badge badge-light restriction numeric-restriction" id="system_min_loglevel_number">Value must be greater or equal to <code>100</code> and lesser or equal to <code>800</code></span></p>
+
+            
+            </div>
+        </div>
+    </div>
+</div>
             </div>
         </div>
     </div>
@@ -2437,73 +2478,26 @@ <h2 class="mb-0">
         </div>
     </div>
 </div>
-<div class="accordion" id="accordionpointset_points_pattern1_min_loglevel">
-    <div class="card">
-        <div class="card-header" id="headingpointset_points_pattern1_min_loglevel">
-            <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#pointset_points_pattern1_min_loglevel"
-                        aria-expanded="" aria-controls="pointset_points_pattern1_min_loglevel" onclick="setAnchor('#pointset_points_pattern1_min_loglevel')"><span class="property-name">min_loglevel</span></button>
-            </h2>
+            </div>
         </div>
-
-        <div id="pointset_points_pattern1_min_loglevel"
-             class="collapse property-definition-div" aria-labelledby="headingpointset_points_pattern1_min_loglevel"
-             data-parent="#accordionpointset_points_pattern1_min_loglevel">
-            <div class="card-body pl-5">
-
-    <div class="breadcrumbs">root
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset" onclick="anchorLink('pointset')">pointset</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points" onclick="anchorLink('pointset_points')">points</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points_pattern1" onclick="anchorLink('pointset_points_pattern1')">Point Pointset Model</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points_pattern1_min_loglevel" onclick="anchorLink('pointset_points_pattern1_min_loglevel')">min_loglevel</a></div><span class="badge badge-dark value-type">Type: integer</span><br/>
-<span class="description"><p>The minimum loglevel for reporting log messages below which log entries should not be sent. Default to 300.</p>
-</span>
-            
-
-            
-            <p><span class="badge badge-light restriction numeric-restriction" id="pointset_points_pattern1_min_loglevel_number">Value must be greater or equal to <code>100</code> and lesser or equal to <code>800</code></span></p>
-
-            
+    </div>
+</div>
             </div>
         </div>
     </div>
 </div>
-<div class="accordion" id="accordionpointset_points_pattern1_sample_limit_sec">
+<div class="accordion" id="accordionpointset_sample_limit_sec">
     <div class="card">
-        <div class="card-header" id="headingpointset_points_pattern1_sample_limit_sec">
+        <div class="card-header" id="headingpointset_sample_limit_sec">
             <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#pointset_points_pattern1_sample_limit_sec"
-                        aria-expanded="" aria-controls="pointset_points_pattern1_sample_limit_sec" onclick="setAnchor('#pointset_points_pattern1_sample_limit_sec')"><span class="property-name">sample_limit_sec</span></button>
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#pointset_sample_limit_sec"
+                        aria-expanded="" aria-controls="pointset_sample_limit_sec" onclick="setAnchor('#pointset_sample_limit_sec')"><span class="property-name">sample_limit_sec</span></button>
             </h2>
         </div>
 
-        <div id="pointset_points_pattern1_sample_limit_sec"
-             class="collapse property-definition-div" aria-labelledby="headingpointset_points_pattern1_sample_limit_sec"
-             data-parent="#accordionpointset_points_pattern1_sample_limit_sec">
+        <div id="pointset_sample_limit_sec"
+             class="collapse property-definition-div" aria-labelledby="headingpointset_sample_limit_sec"
+             data-parent="#accordionpointset_sample_limit_sec">
             <div class="card-body pl-5">
 
     <div class="breadcrumbs">root
@@ -2520,45 +2514,31 @@ <h2 class="mb-0">
                 d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
             />
         </svg>
-    <a href="#pointset_points" onclick="anchorLink('pointset_points')">points</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points_pattern1" onclick="anchorLink('pointset_points_pattern1')">Point Pointset Model</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points_pattern1_sample_limit_sec" onclick="anchorLink('pointset_points_pattern1_sample_limit_sec')">sample_limit_sec</a></div><span class="badge badge-dark value-type">Type: integer</span><br/>
+    <a href="#pointset_sample_limit_sec" onclick="anchorLink('pointset_sample_limit_sec')">sample_limit_sec</a></div><span class="badge badge-dark value-type">Type: integer</span><br/>
 <span class="description"><p>Minimum time between sample updates for the device (including complete and COV updates). Updates more frequent than this should be coalesced into one update.</p>
 </span>
             
 
             
-            <p><span class="badge badge-light restriction numeric-restriction" id="pointset_points_pattern1_sample_limit_sec_number">Value must be greater or equal to <code>0</code> and lesser or equal to <code>86400</code></span></p>
+            <p><span class="badge badge-light restriction numeric-restriction" id="pointset_sample_limit_sec_number">Value must be greater or equal to <code>0</code> and lesser or equal to <code>86400</code></span></p>
 
             
             </div>
         </div>
     </div>
 </div>
-<div class="accordion" id="accordionpointset_points_pattern1_sample_rate_sec">
+<div class="accordion" id="accordionpointset_sample_rate_sec">
     <div class="card">
-        <div class="card-header" id="headingpointset_points_pattern1_sample_rate_sec">
+        <div class="card-header" id="headingpointset_sample_rate_sec">
             <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#pointset_points_pattern1_sample_rate_sec"
-                        aria-expanded="" aria-controls="pointset_points_pattern1_sample_rate_sec" onclick="setAnchor('#pointset_points_pattern1_sample_rate_sec')"><span class="property-name">sample_rate_sec</span></button>
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#pointset_sample_rate_sec"
+                        aria-expanded="" aria-controls="pointset_sample_rate_sec" onclick="setAnchor('#pointset_sample_rate_sec')"><span class="property-name">sample_rate_sec</span></button>
             </h2>
         </div>
 
-        <div id="pointset_points_pattern1_sample_rate_sec"
-             class="collapse property-definition-div" aria-labelledby="headingpointset_points_pattern1_sample_rate_sec"
-             data-parent="#accordionpointset_points_pattern1_sample_rate_sec">
+        <div id="pointset_sample_rate_sec"
+             class="collapse property-definition-div" aria-labelledby="headingpointset_sample_rate_sec"
+             data-parent="#accordionpointset_sample_rate_sec">
             <div class="card-body pl-5">
 
     <div class="breadcrumbs">root
@@ -2575,27 +2555,13 @@ <h2 class="mb-0">
                 d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
             />
         </svg>
-    <a href="#pointset_points" onclick="anchorLink('pointset_points')">points</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points_pattern1" onclick="anchorLink('pointset_points_pattern1')">Point Pointset Model</a>
-        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-            <path
-                fill-rule="evenodd"
-                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
-            />
-        </svg>
-    <a href="#pointset_points_pattern1_sample_rate_sec" onclick="anchorLink('pointset_points_pattern1_sample_rate_sec')">sample_rate_sec</a></div><span class="badge badge-dark value-type">Type: integer</span><br/>
+    <a href="#pointset_sample_rate_sec" onclick="anchorLink('pointset_sample_rate_sec')">sample_rate_sec</a></div><span class="badge badge-dark value-type">Type: integer</span><br/>
 <span class="description"><p>Maximum time between samples for the device to send out a complete update. It can send out updates more frequently than this. Default to 600.</p>
 </span>
             
 
             
-            <p><span class="badge badge-light restriction numeric-restriction" id="pointset_points_pattern1_sample_rate_sec_number">Value must be greater or equal to <code>1</code> and lesser or equal to <code>86400</code></span></p>
+            <p><span class="badge badge-light restriction numeric-restriction" id="pointset_sample_rate_sec_number">Value must be greater or equal to <code>1</code> and lesser or equal to <code>86400</code></span></p>
 
             
             </div>
@@ -2606,14 +2572,6 @@ <h2 class="mb-0">
         </div>
     </div>
 </div>
-            </div>
-        </div>
-    </div>
-</div>
-            </div>
-        </div>
-    </div>
-</div>
 
     <footer>
         <p class="generated-by-footer">Generated using <a href="https://github.com/coveooss/json-schema-for-humans">json-schema-for-humans</a></p>
diff --git a/gencode/java/udmi/schema/PointPointsetConfig.java b/gencode/java/udmi/schema/PointPointsetConfig.java
index 88d7f5f548..0909c0c2cc 100644
--- a/gencode/java/udmi/schema/PointPointsetConfig.java
+++ b/gencode/java/udmi/schema/PointPointsetConfig.java
@@ -18,10 +18,7 @@
 @JsonPropertyOrder({
     "ref",
     "units",
-    "set_value",
-    "min_loglevel",
-    "sample_limit_sec",
-    "sample_rate_sec"
+    "set_value"
 })
 @Generated("jsonschema2pojo")
 public class PointPointsetConfig {
@@ -47,37 +44,13 @@ public class PointPointsetConfig {
     @JsonProperty("set_value")
     @JsonPropertyDescription("Used for cloud writeback functionality, this field specifies the value for a given point in the device's current units.")
     public Object set_value;
-    /**
-     * The minimum loglevel for reporting log messages below which log entries should not be sent. Default to 300.
-     * 
-     */
-    @JsonProperty("min_loglevel")
-    @JsonPropertyDescription("The minimum loglevel for reporting log messages below which log entries should not be sent. Default to 300.")
-    public Integer min_loglevel;
-    /**
-     * Minimum time between sample updates for the device (including complete and COV updates). Updates more frequent than this should be coalesced into one update.
-     * 
-     */
-    @JsonProperty("sample_limit_sec")
-    @JsonPropertyDescription("Minimum time between sample updates for the device (including complete and COV updates). Updates more frequent than this should be coalesced into one update.")
-    public Integer sample_limit_sec;
-    /**
-     * Maximum time between samples for the device to send out a complete update. It can send out updates more frequently than this. Default to 600.
-     * 
-     */
-    @JsonProperty("sample_rate_sec")
-    @JsonPropertyDescription("Maximum time between samples for the device to send out a complete update. It can send out updates more frequently than this. Default to 600.")
-    public Integer sample_rate_sec;
 
     @Override
     public int hashCode() {
         int result = 1;
-        result = ((result* 31)+((this.sample_rate_sec == null)? 0 :this.sample_rate_sec.hashCode()));
         result = ((result* 31)+((this.ref == null)? 0 :this.ref.hashCode()));
-        result = ((result* 31)+((this.set_value == null)? 0 :this.set_value.hashCode()));
-        result = ((result* 31)+((this.min_loglevel == null)? 0 :this.min_loglevel.hashCode()));
         result = ((result* 31)+((this.units == null)? 0 :this.units.hashCode()));
-        result = ((result* 31)+((this.sample_limit_sec == null)? 0 :this.sample_limit_sec.hashCode()));
+        result = ((result* 31)+((this.set_value == null)? 0 :this.set_value.hashCode()));
         return result;
     }
 
@@ -90,7 +63,7 @@ public boolean equals(Object other) {
             return false;
         }
         PointPointsetConfig rhs = ((PointPointsetConfig) other);
-        return (((((((this.sample_rate_sec == rhs.sample_rate_sec)||((this.sample_rate_sec!= null)&&this.sample_rate_sec.equals(rhs.sample_rate_sec)))&&((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref))))&&((this.set_value == rhs.set_value)||((this.set_value!= null)&&this.set_value.equals(rhs.set_value))))&&((this.min_loglevel == rhs.min_loglevel)||((this.min_loglevel!= null)&&this.min_loglevel.equals(rhs.min_loglevel))))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.sample_limit_sec == rhs.sample_limit_sec)||((this.sample_limit_sec!= null)&&this.sample_limit_sec.equals(rhs.sample_limit_sec))));
+        return ((((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref)))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.set_value == rhs.set_value)||((this.set_value!= null)&&this.set_value.equals(rhs.set_value))));
     }
 
 }
diff --git a/gencode/java/udmi/schema/PointPointsetModel.java b/gencode/java/udmi/schema/PointPointsetModel.java
index a738745244..9d1a6b9fc8 100644
--- a/gencode/java/udmi/schema/PointPointsetModel.java
+++ b/gencode/java/udmi/schema/PointPointsetModel.java
@@ -26,10 +26,7 @@
     "baseline_tolerance",
     "baseline_state",
     "cov_increment",
-    "ref",
-    "min_loglevel",
-    "sample_limit_sec",
-    "sample_rate_sec"
+    "ref"
 })
 @Generated("jsonschema2pojo")
 public class PointPointsetModel {
@@ -83,40 +80,16 @@ public class PointPointsetModel {
     @JsonProperty("ref")
     @JsonPropertyDescription("Mapping for the point to an internal resource (e.g. BACnet object reference)")
     public String ref;
-    /**
-     * The minimum loglevel for reporting log messages below which log entries should not be sent. Default to 300.
-     * 
-     */
-    @JsonProperty("min_loglevel")
-    @JsonPropertyDescription("The minimum loglevel for reporting log messages below which log entries should not be sent. Default to 300.")
-    public Integer min_loglevel;
-    /**
-     * Minimum time between sample updates for the device (including complete and COV updates). Updates more frequent than this should be coalesced into one update.
-     * 
-     */
-    @JsonProperty("sample_limit_sec")
-    @JsonPropertyDescription("Minimum time between sample updates for the device (including complete and COV updates). Updates more frequent than this should be coalesced into one update.")
-    public Integer sample_limit_sec;
-    /**
-     * Maximum time between samples for the device to send out a complete update. It can send out updates more frequently than this. Default to 600.
-     * 
-     */
-    @JsonProperty("sample_rate_sec")
-    @JsonPropertyDescription("Maximum time between samples for the device to send out a complete update. It can send out updates more frequently than this. Default to 600.")
-    public Integer sample_rate_sec;
 
     @Override
     public int hashCode() {
         int result = 1;
-        result = ((result* 31)+((this.sample_rate_sec == null)? 0 :this.sample_rate_sec.hashCode()));
         result = ((result* 31)+((this.ref == null)? 0 :this.ref.hashCode()));
         result = ((result* 31)+((this.baseline_value == null)? 0 :this.baseline_value.hashCode()));
-        result = ((result* 31)+((this.min_loglevel == null)? 0 :this.min_loglevel.hashCode()));
         result = ((result* 31)+((this.baseline_state == null)? 0 :this.baseline_state.hashCode()));
         result = ((result* 31)+((this.units == null)? 0 :this.units.hashCode()));
         result = ((result* 31)+((this.baseline_tolerance == null)? 0 :this.baseline_tolerance.hashCode()));
         result = ((result* 31)+((this.cov_increment == null)? 0 :this.cov_increment.hashCode()));
-        result = ((result* 31)+((this.sample_limit_sec == null)? 0 :this.sample_limit_sec.hashCode()));
         result = ((result* 31)+((this.writable == null)? 0 :this.writable.hashCode()));
         return result;
     }
@@ -130,7 +103,7 @@ public boolean equals(Object other) {
             return false;
         }
         PointPointsetModel rhs = ((PointPointsetModel) other);
-        return (((((((((((this.sample_rate_sec == rhs.sample_rate_sec)||((this.sample_rate_sec!= null)&&this.sample_rate_sec.equals(rhs.sample_rate_sec)))&&((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref))))&&((this.baseline_value == rhs.baseline_value)||((this.baseline_value!= null)&&this.baseline_value.equals(rhs.baseline_value))))&&((this.min_loglevel == rhs.min_loglevel)||((this.min_loglevel!= null)&&this.min_loglevel.equals(rhs.min_loglevel))))&&((this.baseline_state == rhs.baseline_state)||((this.baseline_state!= null)&&this.baseline_state.equals(rhs.baseline_state))))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.baseline_tolerance == rhs.baseline_tolerance)||((this.baseline_tolerance!= null)&&this.baseline_tolerance.equals(rhs.baseline_tolerance))))&&((this.cov_increment == rhs.cov_increment)||((this.cov_increment!= null)&&this.cov_increment.equals(rhs.cov_increment))))&&((this.sample_limit_sec == rhs.sample_limit_sec)||((this.sample_limit_sec!= null)&&this.sample_limit_sec.equals(rhs.sample_limit_sec))))&&((this.writable == rhs.writable)||((this.writable!= null)&&this.writable.equals(rhs.writable))));
+        return ((((((((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref)))&&((this.baseline_value == rhs.baseline_value)||((this.baseline_value!= null)&&this.baseline_value.equals(rhs.baseline_value))))&&((this.baseline_state == rhs.baseline_state)||((this.baseline_state!= null)&&this.baseline_state.equals(rhs.baseline_state))))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.baseline_tolerance == rhs.baseline_tolerance)||((this.baseline_tolerance!= null)&&this.baseline_tolerance.equals(rhs.baseline_tolerance))))&&((this.cov_increment == rhs.cov_increment)||((this.cov_increment!= null)&&this.cov_increment.equals(rhs.cov_increment))))&&((this.writable == rhs.writable)||((this.writable!= null)&&this.writable.equals(rhs.writable))));
     }
 
 
diff --git a/gencode/java/udmi/schema/PointsetModel.java b/gencode/java/udmi/schema/PointsetModel.java
index ab9f5cf298..0793561f83 100644
--- a/gencode/java/udmi/schema/PointsetModel.java
+++ b/gencode/java/udmi/schema/PointsetModel.java
@@ -17,7 +17,9 @@
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
-    "points"
+    "points",
+    "sample_limit_sec",
+    "sample_rate_sec"
 })
 @Generated("jsonschema2pojo")
 public class PointsetModel {
@@ -30,10 +32,26 @@ public class PointsetModel {
     @JsonProperty("points")
     @JsonPropertyDescription("Information about a specific point name of the device.")
     public HashMap<String, PointPointsetModel> points;
+    /**
+     * Minimum time between sample updates for the device (including complete and COV updates). Updates more frequent than this should be coalesced into one update.
+     * 
+     */
+    @JsonProperty("sample_limit_sec")
+    @JsonPropertyDescription("Minimum time between sample updates for the device (including complete and COV updates). Updates more frequent than this should be coalesced into one update.")
+    public Integer sample_limit_sec;
+    /**
+     * Maximum time between samples for the device to send out a complete update. It can send out updates more frequently than this. Default to 600.
+     * 
+     */
+    @JsonProperty("sample_rate_sec")
+    @JsonPropertyDescription("Maximum time between samples for the device to send out a complete update. It can send out updates more frequently than this. Default to 600.")
+    public Integer sample_rate_sec;
 
     @Override
     public int hashCode() {
         int result = 1;
+        result = ((result* 31)+((this.sample_rate_sec == null)? 0 :this.sample_rate_sec.hashCode()));
+        result = ((result* 31)+((this.sample_limit_sec == null)? 0 :this.sample_limit_sec.hashCode()));
         result = ((result* 31)+((this.points == null)? 0 :this.points.hashCode()));
         return result;
     }
@@ -47,7 +65,7 @@ public boolean equals(Object other) {
             return false;
         }
         PointsetModel rhs = ((PointsetModel) other);
-        return ((this.points == rhs.points)||((this.points!= null)&&this.points.equals(rhs.points)));
+        return ((((this.sample_rate_sec == rhs.sample_rate_sec)||((this.sample_rate_sec!= null)&&this.sample_rate_sec.equals(rhs.sample_rate_sec)))&&((this.sample_limit_sec == rhs.sample_limit_sec)||((this.sample_limit_sec!= null)&&this.sample_limit_sec.equals(rhs.sample_limit_sec))))&&((this.points == rhs.points)||((this.points!= null)&&this.points.equals(rhs.points))));
     }
 
 }
diff --git a/gencode/java/udmi/schema/SystemModel.java b/gencode/java/udmi/schema/SystemModel.java
index 579cbc4e81..afdd1583f6 100644
--- a/gencode/java/udmi/schema/SystemModel.java
+++ b/gencode/java/udmi/schema/SystemModel.java
@@ -18,7 +18,8 @@
 @JsonPropertyOrder({
     "location",
     "physical_tag",
-    "aux"
+    "aux",
+    "min_loglevel"
 })
 @Generated("jsonschema2pojo")
 public class SystemModel {
@@ -41,6 +42,13 @@ public class SystemModel {
     public Physical_tag physical_tag;
     @JsonProperty("aux")
     public Aux aux;
+    /**
+     * The minimum loglevel for reporting log messages below which log entries should not be sent. Default to 300.
+     * 
+     */
+    @JsonProperty("min_loglevel")
+    @JsonPropertyDescription("The minimum loglevel for reporting log messages below which log entries should not be sent. Default to 300.")
+    public Integer min_loglevel = 300;
 
     @Override
     public int hashCode() {
@@ -48,6 +56,7 @@ public int hashCode() {
         result = ((result* 31)+((this.location == null)? 0 :this.location.hashCode()));
         result = ((result* 31)+((this.physical_tag == null)? 0 :this.physical_tag.hashCode()));
         result = ((result* 31)+((this.aux == null)? 0 :this.aux.hashCode()));
+        result = ((result* 31)+((this.min_loglevel == null)? 0 :this.min_loglevel.hashCode()));
         return result;
     }
 
@@ -60,7 +69,7 @@ public boolean equals(Object other) {
             return false;
         }
         SystemModel rhs = ((SystemModel) other);
-        return ((((this.location == rhs.location)||((this.location!= null)&&this.location.equals(rhs.location)))&&((this.physical_tag == rhs.physical_tag)||((this.physical_tag!= null)&&this.physical_tag.equals(rhs.physical_tag))))&&((this.aux == rhs.aux)||((this.aux!= null)&&this.aux.equals(rhs.aux))));
+        return (((((this.location == rhs.location)||((this.location!= null)&&this.location.equals(rhs.location)))&&((this.physical_tag == rhs.physical_tag)||((this.physical_tag!= null)&&this.physical_tag.equals(rhs.physical_tag))))&&((this.aux == rhs.aux)||((this.aux!= null)&&this.aux.equals(rhs.aux))))&&((this.min_loglevel == rhs.min_loglevel)||((this.min_loglevel!= null)&&this.min_loglevel.equals(rhs.min_loglevel))));
     }
 
 }
diff --git a/gencode/python/udmi/schema/config_pointset_point.py b/gencode/python/udmi/schema/config_pointset_point.py
index cdb2d92bd1..57084817df 100644
--- a/gencode/python/udmi/schema/config_pointset_point.py
+++ b/gencode/python/udmi/schema/config_pointset_point.py
@@ -8,9 +8,6 @@ def __init__(self):
     self.ref = None
     self.units = None
     self.set_value = None
-    self.min_loglevel = None
-    self.sample_limit_sec = None
-    self.sample_rate_sec = None
 
   @staticmethod
   def from_dict(source):
@@ -20,9 +17,6 @@ def from_dict(source):
     result.ref = source.get('ref')
     result.units = source.get('units')
     result.set_value = source.get('set_value')
-    result.min_loglevel = source.get('min_loglevel')
-    result.sample_limit_sec = source.get('sample_limit_sec')
-    result.sample_rate_sec = source.get('sample_rate_sec')
     return result
 
   @staticmethod
@@ -49,10 +43,4 @@ def to_dict(self):
       result['units'] = self.units # 5
     if self.set_value:
       result['set_value'] = self.set_value # 5
-    if self.min_loglevel:
-      result['min_loglevel'] = self.min_loglevel # 5
-    if self.sample_limit_sec:
-      result['sample_limit_sec'] = self.sample_limit_sec # 5
-    if self.sample_rate_sec:
-      result['sample_rate_sec'] = self.sample_rate_sec # 5
     return result
diff --git a/gencode/python/udmi/schema/model_pointset.py b/gencode/python/udmi/schema/model_pointset.py
index c994e65427..4f58e26a4e 100644
--- a/gencode/python/udmi/schema/model_pointset.py
+++ b/gencode/python/udmi/schema/model_pointset.py
@@ -7,6 +7,8 @@ class PointsetModel:
 
   def __init__(self):
     self.points = None
+    self.sample_limit_sec = None
+    self.sample_rate_sec = None
 
   @staticmethod
   def from_dict(source):
@@ -14,6 +16,8 @@ def from_dict(source):
       return None
     result = PointsetModel()
     result.points = PointPointsetModel.map_from(source.get('points'))
+    result.sample_limit_sec = source.get('sample_limit_sec')
+    result.sample_rate_sec = source.get('sample_rate_sec')
     return result
 
   @staticmethod
@@ -36,4 +40,8 @@ def to_dict(self):
     result = {}
     if self.points:
       result['points'] = PointPointsetModel.expand_dict(self.points) # 2
+    if self.sample_limit_sec:
+      result['sample_limit_sec'] = self.sample_limit_sec # 5
+    if self.sample_rate_sec:
+      result['sample_rate_sec'] = self.sample_rate_sec # 5
     return result
diff --git a/gencode/python/udmi/schema/model_pointset_point.py b/gencode/python/udmi/schema/model_pointset_point.py
index 9e92c11509..1c3eb4f292 100644
--- a/gencode/python/udmi/schema/model_pointset_point.py
+++ b/gencode/python/udmi/schema/model_pointset_point.py
@@ -12,9 +12,6 @@ def __init__(self):
     self.baseline_state = None
     self.cov_increment = None
     self.ref = None
-    self.min_loglevel = None
-    self.sample_limit_sec = None
-    self.sample_rate_sec = None
 
   @staticmethod
   def from_dict(source):
@@ -28,9 +25,6 @@ def from_dict(source):
     result.baseline_state = source.get('baseline_state')
     result.cov_increment = source.get('cov_increment')
     result.ref = source.get('ref')
-    result.min_loglevel = source.get('min_loglevel')
-    result.sample_limit_sec = source.get('sample_limit_sec')
-    result.sample_rate_sec = source.get('sample_rate_sec')
     return result
 
   @staticmethod
@@ -65,10 +59,4 @@ def to_dict(self):
       result['cov_increment'] = self.cov_increment # 5
     if self.ref:
       result['ref'] = self.ref # 5
-    if self.min_loglevel:
-      result['min_loglevel'] = self.min_loglevel # 5
-    if self.sample_limit_sec:
-      result['sample_limit_sec'] = self.sample_limit_sec # 5
-    if self.sample_rate_sec:
-      result['sample_rate_sec'] = self.sample_rate_sec # 5
     return result
diff --git a/gencode/python/udmi/schema/model_system.py b/gencode/python/udmi/schema/model_system.py
index a574ef157c..a8ead4ca05 100644
--- a/gencode/python/udmi/schema/model_system.py
+++ b/gencode/python/udmi/schema/model_system.py
@@ -217,6 +217,7 @@ def __init__(self):
     self.location = None
     self.physical_tag = None
     self.aux = None
+    self.min_loglevel = None
 
   @staticmethod
   def from_dict(source):
@@ -226,6 +227,7 @@ def from_dict(source):
     result.location = Object683EF6A1.from_dict(source.get('location'))
     result.physical_tag = Object45E20BB3.from_dict(source.get('physical_tag'))
     result.aux = ObjectCA9644FB.from_dict(source.get('aux'))
+    result.min_loglevel = source.get('min_loglevel')
     return result
 
   @staticmethod
@@ -252,4 +254,6 @@ def to_dict(self):
       result['physical_tag'] = self.physical_tag.to_dict() # 4
     if self.aux:
       result['aux'] = self.aux.to_dict() # 4
+    if self.min_loglevel:
+      result['min_loglevel'] = self.min_loglevel # 5
     return result
diff --git a/pubber/.idea/checkstyle-idea.xml b/pubber/.idea/checkstyle-idea.xml
new file mode 100644
index 0000000000..5a8e88e07c
--- /dev/null
+++ b/pubber/.idea/checkstyle-idea.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CheckStyle-IDEA">
+    <option name="configuration">
+      <map>
+        <entry key="checkstyle-version" value="10.1" />
+        <entry key="copy-libs" value="false" />
+        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
+        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
+        <entry key="scan-before-checkin" value="false" />
+        <entry key="scanscope" value="JavaOnly" />
+        <entry key="suppress-errors" value="false" />
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/schema/config_pointset_point.json b/schema/config_pointset_point.json
index 35cc3a2f27..a085b2d354 100644
--- a/schema/config_pointset_point.json
+++ b/schema/config_pointset_point.json
@@ -16,24 +16,6 @@
     "set_value": {
       "description": "Used for cloud writeback functionality, this field specifies the value for a given point in the device's current units.",
       "examples": [22.4]
-    },
-    "min_loglevel": {
-      "description": "The minimum loglevel for reporting log messages below which log entries should not be sent. Default to 300.",
-      "type": "integer",
-      "minimum": 100,
-      "maximum": 800
-    },
-    "sample_limit_sec": {
-      "description": "Minimum time between sample updates for the device (including complete and COV updates). Updates more frequent than this should be coalesced into one update.",
-      "type": "integer",
-      "minimum": 0,
-      "maximum": 86400
-    },
-    "sample_rate_sec": {
-      "description": "Maximum time between samples for the device to send out a complete update. It can send out updates more frequently than this. Default to 600.",
-      "type": "integer",
-      "minimum": 1,
-      "maximum": 86400
     }
   }
 }
diff --git a/schema/model_pointset.json b/schema/model_pointset.json
index be8d664558..427ec1182e 100644
--- a/schema/model_pointset.json
+++ b/schema/model_pointset.json
@@ -15,6 +15,18 @@
           "$ref": "file:model_pointset_point.json#"
         }
       }
+    },
+    "sample_limit_sec": {
+      "description": "Minimum time between sample updates for the device (including complete and COV updates). Updates more frequent than this should be coalesced into one update.",
+      "type": "integer",
+      "minimum": 0,
+      "maximum": 86400
+    },
+    "sample_rate_sec": {
+      "description": "Maximum time between samples for the device to send out a complete update. It can send out updates more frequently than this. Default to 600.",
+      "type": "integer",
+      "minimum": 1,
+      "maximum": 86400
     }
   },
   "required": [
diff --git a/schema/model_pointset_point.json b/schema/model_pointset_point.json
index b8b820170f..4da9fb59b9 100644
--- a/schema/model_pointset_point.json
+++ b/schema/model_pointset_point.json
@@ -41,24 +41,6 @@
       "description": "Mapping for the point to an internal resource (e.g. BACnet object reference)",
       "type": "string",
       "examples": ["AI3.Present_Value", "400070"]
-    },
-    "min_loglevel": {
-      "description": "The minimum loglevel for reporting log messages below which log entries should not be sent. Default to 300.",
-      "type": "integer",
-      "minimum": 100,
-      "maximum": 800
-    },
-    "sample_limit_sec": {
-      "description": "Minimum time between sample updates for the device (including complete and COV updates). Updates more frequent than this should be coalesced into one update.",
-      "type": "integer",
-      "minimum": 0,
-      "maximum": 86400
-    },
-    "sample_rate_sec": {
-      "description": "Maximum time between samples for the device to send out a complete update. It can send out updates more frequently than this. Default to 600.",
-      "type": "integer",
-      "minimum": 1,
-      "maximum": 86400
     }
   }
 }
diff --git a/schema/model_system.json b/schema/model_system.json
index 5c1fa29fd1..b4e37a2d6f 100644
--- a/schema/model_system.json
+++ b/schema/model_system.json
@@ -84,6 +84,13 @@
           "pattern": "^[a-zA-Z0-9-]+$"
         }
       }
+    },
+    "min_loglevel": {
+      "description": "The minimum loglevel for reporting log messages below which log entries should not be sent. Default to 300.",
+      "type": "integer",
+      "minimum": 100,
+      "maximum": 800,
+      "default": 300
     }
   },
   "required": [
diff --git a/validator/.idea/checkstyle-idea.xml b/validator/.idea/checkstyle-idea.xml
new file mode 100644
index 0000000000..5a8e88e07c
--- /dev/null
+++ b/validator/.idea/checkstyle-idea.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CheckStyle-IDEA">
+    <option name="configuration">
+      <map>
+        <entry key="checkstyle-version" value="10.1" />
+        <entry key="copy-libs" value="false" />
+        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
+        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
+        <entry key="scan-before-checkin" value="false" />
+        <entry key="scanscope" value="JavaOnly" />
+        <entry key="suppress-errors" value="false" />
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/validator/src/main/java/com/google/daq/mqtt/registrar/LocalDevice.java b/validator/src/main/java/com/google/daq/mqtt/registrar/LocalDevice.java
index 15e26cde7f..3dc0c2bbf5 100644
--- a/validator/src/main/java/com/google/daq/mqtt/registrar/LocalDevice.java
+++ b/validator/src/main/java/com/google/daq/mqtt/registrar/LocalDevice.java
@@ -65,6 +65,7 @@
 import udmi.schema.PointPointsetConfig;
 import udmi.schema.PointPointsetModel;
 import udmi.schema.PointsetConfig;
+import udmi.schema.SystemConfig;
 
 class LocalDevice {
 
@@ -546,6 +547,13 @@ public Config deviceConfigObject() {
     if (metadata.localnet != null) {
       config.localnet = getDeviceLocalnetConfig();
     }
+    // Copy selected MetadataSystem properties into device config.
+    if (metadata.system.min_loglevel != null) {
+      if (config.system == null) {
+        config.system = new SystemConfig();
+      }
+      config.system.min_loglevel = metadata.system.min_loglevel;
+    }
     return config;
   }
 
@@ -562,6 +570,14 @@ private PointsetConfig getDevicePointsetConfig() {
         (metadataKey, value) ->
             pointsetConfig.points.computeIfAbsent(
                 metadataKey, configKey -> configFromMetadata(value)));
+
+    // Copy selected MetadataPointset properties into PointsetConfig.
+    if (metadata.pointset.sample_limit_sec != null) {
+      pointsetConfig.sample_limit_sec = metadata.pointset.sample_limit_sec;
+    }
+    if (metadata.pointset.sample_rate_sec != null) {
+      pointsetConfig.sample_rate_sec = metadata.pointset.sample_rate_sec;
+    }
     return pointsetConfig;
   }
 
@@ -571,9 +587,6 @@ PointPointsetConfig configFromMetadata(PointPointsetModel metadata) {
     if (Boolean.TRUE.equals(metadata.writable)) {
       pointConfig.set_value = metadata.baseline_value;
     }
-    pointConfig.min_loglevel = metadata.min_loglevel;
-    pointConfig.sample_limit_sec = metadata.sample_limit_sec;
-    pointConfig.sample_rate_sec = metadata.sample_rate_sec;
     return pointConfig;
   }