diff --git a/.gencode_hash.txt b/.gencode_hash.txt
index fb7cb6c8fa..131fb598d0 100644
--- a/.gencode_hash.txt
+++ b/.gencode_hash.txt
@@ -1,9 +1,9 @@
-909b90e19ba41e691ea277eb26ff8a3b7d7bad43ecd7ac082683e97401bde9b5  gencode/docs/cloud_iot_config.html
 b35646a2f3d7c30fd34e3ea6ab6a1070b39c469fd1de49cab1093ff32faaf06d  gencode/docs/command_discovery.html
 e1f62882576d0f4332360f2aedb79b37a43973fb31d862c829af924f8f310ec1  gencode/docs/command_mapping.html
 5513a43ef916d0413de0c95aede03042ce8824e98fbb8f3634c12f5dee53cce8  gencode/docs/config.html
 30c7f39e50e290b0a36a3414cf1c90277ebd249f126f85f0a307bc7b74164e08  gencode/docs/config_mapping.html
 5598402bde04860394d91ecf43f5c653ff539cce49d011db4b5b17d596b72c2a  gencode/docs/configuration_endpoint.html
+b7ca70e3176f997f254c32bd8d53dff1462ac8a71c0e166aaa85193d67bff60b  gencode/docs/configuration_execution.html
 00e8646fd8117d47ddf32f2488228cd35b66fd711cb21288dc6bb5a5715978cb  gencode/docs/configuration_pubber.html
 82fbf41e4e88593f22a929fc8ade4d1e8f75a0fc1aa8452ea1d3b19023bee314  gencode/docs/envelope.html
 f1fde870638541bea6de16acd64365c89a7d56ee3270d6fd1bcdbb5bdb141887  gencode/docs/event.html
@@ -15,7 +15,7 @@ a8800ab8384de3b846af0d72cf310acf01644842b557e42eec20b69a0bfa1868  gencode/docs/e
 9ae793a641f2e053c5af734bf813cd2637a675330acb8d9e903ef03b4286e007  gencode/docs/metadata.html
 e101ec26541b7787fa722244fed744713d05649de547160f39744e1e61850ddd  gencode/docs/persistent_device.html
 5d039d607af9ec75ee552dfe36b16c702687ea16f5663f41fc49b4533b86e00d  gencode/docs/properties.html
-846eaf1735bd2506357173cfc720c8674d95acf2d20e19f37e3d34cad0a345d2  gencode/docs/readme.md
+392f272c1c8cd047eb6906f2f11ffacc7083c32f639da2437d6a9ca861062ecc  gencode/docs/readme.md
 690d56e96c4e180e49e0abcba358ab1842ea06dd3f693918852a9de370c994d5  gencode/docs/reflect_config.html
 9332e44c87dae9261b079424e748d5ee1df08a3c6b39987d254ebf78274e2f34  gencode/docs/reflect_state.html
 741b880216be3743f6747800a042f2dbd89f3b0344c6b0a965f4bc010f03a930  gencode/docs/schema_doc.css
@@ -32,7 +32,6 @@ b9f903444ab08907e41eb123286434ff3207b1edd01397af3ddefb8475bbdadc  gencode/java/u
 fcbed49f1af8b791d8c52bcbe18f65521a79d9ac3eb33ec3afd9b342ab2bfc56  gencode/java/udmi/schema/BlobsetState.java
 0a4f6bcd5065418c1cdc6c05b900b3de31744847d25b6ab6de7aabb1e724710e  gencode/java/udmi/schema/BuildingTranslation.java
 b95ab79a531c917a5004b5e5bc70e010b33d5d6ff53be09e5dbf2d1df479b569  gencode/java/udmi/schema/Category.java
-d6875f63ce67d1b945a0b75a4a660bd083cc52492371a7350c4109f6bf54968b  gencode/java/udmi/schema/CloudIotConfig.java
 a2eeff86f4302272736d84602e2ca36a64d27c8ef6761cc05ffb8ad17b030d4d  gencode/java/udmi/schema/CloudModel.java
 ff79de9390aa25bb45fb3e2ebb682c865ccab764f56d9644377d9d28c0ab10e4  gencode/java/udmi/schema/Config.java
 10d67bf2080403fd196f63097e4ce2151edaafe3cf4ac77598ef83e06f94cb05  gencode/java/udmi/schema/DeviceMappingConfig.java
@@ -48,6 +47,7 @@ b90ab40a281c5e383881629bd8a791ba3d30491e06ebc623a476e2735a3f6c3a  gencode/java/u
 885859ea9de29217186c34f3a90b112411d1beddaf58a88b85e7934cd3c92b6f  gencode/java/udmi/schema/Entry.java
 9b92e03774ed0b9159ff3ab462822699ef7f824161b166a881889ea1eb6a62ad  gencode/java/udmi/schema/Envelope.java
 e9f5c77be81486b6b8c6d88f70f2d50583d8c3fafa2ac09ead80f44b8d5e751e  gencode/java/udmi/schema/Event.java
+69c3c12ce057b6ab8e27ab8cab6fb009bfd1c997652214b49e6f2a26a58f302c  gencode/java/udmi/schema/ExecutionConfiguration.java
 2e77a29988e6c17875d3f781be931e3b835bb310639f60d3bb28f24405a86bed  gencode/java/udmi/schema/FamilyDiscoveryConfig.java
 ae4a645f199c8e24b3303463d428ca17af7603ae9ae9238397a6a82e752ab454  gencode/java/udmi/schema/FamilyDiscoveryEvent.java
 0afc15acd72874e5a0c47f546abc0c4569f5bc37838fdcac77bc7bd55cc53a6d  gencode/java/udmi/schema/FamilyDiscoveryState.java
@@ -98,12 +98,11 @@ d3968b92497e83a63f18cc0e74484a9807f1bb92db0c92d556ec2caaa143d645  gencode/java/u
 ac6f8fd87c8986cce01e872460c15ff6fe71e3816f9bde610acfe25f7d38c8d4  gencode/java/udmi/schema/ValidationEvent.java
 f7d117dc8b9764acf0c95a13a2bfdfbdf31d1a8ec83a707448aa4d7391ef07e2  gencode/java/udmi/schema/ValidationState.java
 e007ddd1ceeae3603c85110c33e1bb4a418ff9c7a791ca0df25b7ea3caeafd36  gencode/java/udmi/schema/ValidationSummary.java
-0601b86702f0e8959a391342307cd782be91e7dcfa0017089230a38e76661dd5  gencode/python/udmi/schema/__init__.py
+67256cd379f8b456a2d8c3b5e64c9bde740569338f8e32be626ecb65ad6fd23c  gencode/python/udmi/schema/__init__.py
 4b25dd95f863059b761269f93adcae7049507924a1c6e74d6856849203c179db  gencode/python/udmi/schema/ancillary_properties.py
 5ecd6c542f33450cb4ce75d940a6dff4d3bd67d4b9de4aff5ee88abcc301dbff  gencode/python/udmi/schema/building_config.py
 dab4f5fca272ec48c2881bca2b6bc43786ada47fa1f6dd935c35f7ce0eb6b0f6  gencode/python/udmi/schema/building_translation.py
 c33fab16eb86b93692ddbb243a2d6cfe202ca1a0fd76b351a18727a35940d958  gencode/python/udmi/schema/category.py
-a61b1c5732f01b7efda41a773d5786fad755f371193ce4478b458387ca2a8fe8  gencode/python/udmi/schema/cloud_iot_config.py
 6578d68f65b87b781086e72566de910db4bef365599fe3188862d4d8a81e84fb  gencode/python/udmi/schema/command_discovery.py
 1254c34d973c9099ae99dcea4534e234e9019f49255e2e27d2afa1bc074fd596  gencode/python/udmi/schema/command_mapping.py
 c5a62f92328e2ede167fc1f53bece6e48696a0ab0e37e3a41f65cd98494ba0d7  gencode/python/udmi/schema/common.py
@@ -121,6 +120,7 @@ ac3facbd96f7cb2f7e387e7497d6a36af379a2687329571f250c5670f9933244  gencode/python
 ba37d2d54df565aba42ef055a0ec961175d180c2e8092a914e62029bc5388857  gencode/python/udmi/schema/config_system.py
 97c2e5fadc6da0d84660f3296de885ab59f4b04154179b6717f77ec366f1544b  gencode/python/udmi/schema/config_system_testing.py
 4637fc257ea4d6ea5a46d98db69c57e27e4ecbf5d86f77036cd1382f1a40f532  gencode/python/udmi/schema/configuration_endpoint.py
+e8a1574074554b6144b178d2adedc76a1c7be5ae911b253deff4460d8d82c6ee  gencode/python/udmi/schema/configuration_execution.py
 3814c88403934dbd3fce77d92a8ad45c68dc7e07c319ba9b4e8f1b1ac7518c07  gencode/python/udmi/schema/configuration_pubber.py
 998ce105f88686f27b85f3630a396ed04b106f830c133a684ea5c505ca95b1c3  gencode/python/udmi/schema/envelope.py
 1eb9019b9d0b4ff7de2df8beb625a4f89292d636ece0c02f160495c537bd6c2c  gencode/python/udmi/schema/event.py
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 08b8b2867b..064bae8d58 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -135,6 +135,10 @@ jobs:
           cd sites/udmi_site_model/out
           echo Output from `pwd`
           more `find out -type f`
+      - name: validator logs
+        if: ${{ always() }}
+        run: |
+          cat out/validator.out || true
       - name: pubber logs
         if: ${{ always() }}
         run: |
diff --git a/bin/test_trace b/bin/test_trace
index 194a558271..788531fddc 100755
--- a/bin/test_trace
+++ b/bin/test_trace
@@ -20,6 +20,7 @@ echo
 for file in `find $site_out -type f`; do
     sed -E -i $file \
         -e "s/[0-9-]{10}T[0-9:]{8}Z/1999-10-20T01:02:03Z/" \
+        -e "s/Validator.java:[0-9]+/redacted/" \
         -e 's/\\t[a-zA-Z .()$0-9]+\.java:[0-9]+\)\\n/\\tredacted\\n/g'
 done
 
diff --git a/bin/test_validator b/bin/test_validator
index 1c55336d7c..308f95a2c1 100755
--- a/bin/test_validator
+++ b/bin/test_validator
@@ -116,4 +116,5 @@ echo Found out files $outfiles, copying to $TMP_VALIDATOR
 # Include /dev/null so that more has >1 to chomp on and outputs headers.
 more /dev/null $outfiles | sed -E >> $TMP_VALIDATOR \
         -e "s/[0-9-]{10}T[0-9:]{8}Z/1999-10-20T01:02:03Z/" \
+        -e "s/Validator.java:[0-9]+/redacted/" \
         -e 's/\\t[a-zA-Z .()$0-9]+\.java:[0-9]+\)\\n/\\tredacted\\n/g' \
diff --git a/bin/validator b/bin/validator
index 65055f3563..92e2abe554 100755
--- a/bin/validator
+++ b/bin/validator
@@ -20,9 +20,6 @@ if [ ! -f $site_path/cloud_iot_config.json ]; then
     false
 fi
 
-echo Building validator...
-$ROOT_DIR/validator/bin/build > /dev/null
-
 echo Running tools version `(cd $ROOT_DIR; git describe)`
 
 if [[ -n $subscription ]]; then
diff --git a/validator/src/main/java/com/google/daq/mqtt/validator/CleanDateFormat.java b/common/src/main/java/com/google/udmi/util/CleanDateFormat.java
similarity index 97%
rename from validator/src/main/java/com/google/daq/mqtt/validator/CleanDateFormat.java
rename to common/src/main/java/com/google/udmi/util/CleanDateFormat.java
index f9b97f94c5..2b7b4ddd44 100644
--- a/validator/src/main/java/com/google/daq/mqtt/validator/CleanDateFormat.java
+++ b/common/src/main/java/com/google/udmi/util/CleanDateFormat.java
@@ -1,4 +1,4 @@
-package com.google.daq.mqtt.validator;
+package com.google.udmi.util;
 
 import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
 import java.text.ParseException;
diff --git a/common/src/main/java/com/google/udmi/util/GeneralUtils.java b/common/src/main/java/com/google/udmi/util/GeneralUtils.java
index 8599b02f20..c0db3dddcb 100644
--- a/common/src/main/java/com/google/udmi/util/GeneralUtils.java
+++ b/common/src/main/java/com/google/udmi/util/GeneralUtils.java
@@ -8,6 +8,7 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class GeneralUtils {
 
@@ -76,12 +77,38 @@ public static void toJsonFile(File file, Object target) {
     }
   }
 
-  public static <T> T deepCopy(T endpoint1, Class<T> valueType) {
+  public static <T> T deepCopy(T object) {
+    Class<?> targetClass = object.getClass();
     try {
-      return OBJECT_MAPPER.readValue(toJsonString(endpoint1),
-          valueType);
+      @SuppressWarnings("unchecked")
+      T t = (T) OBJECT_MAPPER.readValue(toJsonString(object), targetClass);
+      return t;
     } catch (Exception e) {
-      throw new RuntimeException("While making deep copy of " + valueType.getName(), e);
+      throw new RuntimeException("While making deep copy of " + targetClass.getName(), e);
+    }
+  }
+
+  public static <T> T mergeObject(Object destination, Object source) {
+    Map<String, Object> target = JsonUtil.asMap(destination);
+    mergeObject(target, JsonUtil.asMap(source));
+    @SuppressWarnings("unchecked")
+    T t = (T) JsonUtil.convertTo(destination.getClass(), target);
+    return t;
+  }
+
+  public static void mergeObject(Map<String, Object> target, Map<String, Object> source) {
+    for (String key : source.keySet()) {
+      Object targetValue = target.get(key);
+      Object sourceValue = source.get(key);
+      if (targetValue instanceof Map && sourceValue instanceof Map) {
+        @SuppressWarnings("unchecked")
+        Map<String, Object> castTarget = (Map<String, Object>) targetValue;
+        @SuppressWarnings("unchecked")
+        Map<String, Object> castSource = (Map<String, Object>) sourceValue;
+        mergeObject(castTarget, castSource);
+      } else {
+        target.put(key, sourceValue);
+      }
     }
   }
 }
diff --git a/validator/src/main/java/com/google/daq/mqtt/util/JsonUtil.java b/common/src/main/java/com/google/udmi/util/JsonUtil.java
similarity index 82%
rename from validator/src/main/java/com/google/daq/mqtt/util/JsonUtil.java
rename to common/src/main/java/com/google/udmi/util/JsonUtil.java
index 71d3ed69c4..b742d7c6cb 100644
--- a/validator/src/main/java/com/google/daq/mqtt/util/JsonUtil.java
+++ b/common/src/main/java/com/google/udmi/util/JsonUtil.java
@@ -1,4 +1,4 @@
-package com.google.daq.mqtt.util;
+package com.google.udmi.util;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -7,7 +7,6 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.google.daq.mqtt.validator.CleanDateFormat;
 import java.io.File;
 import java.time.Instant;
 import java.util.Date;
@@ -95,9 +94,10 @@ public static <T> T convertTo(Class<T> targetClass, Object message) {
    * @param message input object to convert
    * @return object-as-map
    */
-  @SuppressWarnings("unchecked")
   public static Map<String, Object> toMap(Object message) {
-    return convertTo(TreeMap.class, message);
+    @SuppressWarnings("unchecked")
+    Map<String, Object> map = convertTo(TreeMap.class, message);
+    return map;
   }
 
   /**
@@ -144,7 +144,37 @@ public static void writeFile(Object target, File file) {
     }
   }
 
+  /**
+   * Get a date object parsed from a string representation.
+   *
+   * @param timestamp string representation
+   * @return Date object
+   */
   public static Date getDate(String timestamp) {
     return timestamp == null ? null : Date.from(Instant.parse(timestamp));
   }
+
+  /**
+   * Convert the json string to a generic map object.
+   *
+   * @param input input string
+   * @return input as map object
+   */
+  public static Map<String, Object> asMap(String input) {
+    @SuppressWarnings("unchecked")
+    Map<String, Object> map = convertTo(TreeMap.class, input);
+    return map;
+  }
+
+  /**
+   * Convert the json object to a generic map object.
+   *
+   * @param input input object
+   * @return input as map object
+   */
+  public static Map<String, Object> asMap(Object input) {
+    @SuppressWarnings("unchecked")
+    Map<String, Object> map = convertTo(TreeMap.class, input);
+    return map;
+  }
 }
diff --git a/common/src/main/java/com/google/udmi/util/SiteModel.java b/common/src/main/java/com/google/udmi/util/SiteModel.java
index 8f059914a7..728f535196 100644
--- a/common/src/main/java/com/google/udmi/util/SiteModel.java
+++ b/common/src/main/java/com/google/udmi/util/SiteModel.java
@@ -17,10 +17,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import udmi.schema.CloudIotConfig;
 import udmi.schema.CloudModel.Auth_type;
 import udmi.schema.EndpointConfiguration;
 import udmi.schema.Envelope;
+import udmi.schema.ExecutionConfiguration;
 import udmi.schema.GatewayModel;
 import udmi.schema.Metadata;
 
@@ -39,17 +39,17 @@ public class SiteModel {
   final String sitePath;
   private Map<String, Metadata> allMetadata;
   private Map<String, Device> allDevices;
-  private CloudIotConfig cloudIotConfig;
+  private ExecutionConfiguration executionConfiguration;
 
   public SiteModel(String sitePath) {
     this.sitePath = sitePath;
   }
 
   public static EndpointConfiguration makeEndpointConfig(String projectId,
-      CloudIotConfig cloudIotConfig, String deviceId) {
+      ExecutionConfiguration executionConfig, String deviceId) {
     EndpointConfiguration endpoint = new EndpointConfiguration();
     endpoint.client_id = getClientId(projectId,
-        cloudIotConfig.cloud_region, cloudIotConfig.registry_id, deviceId);
+        executionConfig.cloud_region, executionConfig.registry_id, deviceId);
     endpoint.hostname = DEFAULT_ENDPOINT_HOSTNAME;
     return endpoint;
   }
@@ -59,18 +59,18 @@ public static String getClientId(String projectId, String cloudRegion, String re
     return String.format(ID_FORMAT, projectId, cloudRegion, registryId, deviceId);
   }
 
-  private static CloudIotConfig makeCloudIotConfig(Envelope attributes) {
-    CloudIotConfig cloudIotConfig = new CloudIotConfig();
-    cloudIotConfig.registry_id = Preconditions.checkNotNull(attributes.deviceRegistryId,
+  private static ExecutionConfiguration makeExecutionConfiguration(Envelope attributes) {
+    ExecutionConfiguration executionConfiguration = new ExecutionConfiguration();
+    executionConfiguration.registry_id = Preconditions.checkNotNull(attributes.deviceRegistryId,
         "deviceRegistryId");
-    cloudIotConfig.cloud_region = Preconditions.checkNotNull(attributes.deviceRegistryLocation,
+    executionConfiguration.cloud_region = Preconditions.checkNotNull(attributes.deviceRegistryLocation,
         "deviceRegistryLocation");
-    return cloudIotConfig;
+    return executionConfiguration;
   }
 
   public static EndpointConfiguration makeEndpointConfig(Envelope attributes) {
-    CloudIotConfig cloudIotConfig = makeCloudIotConfig(attributes);
-    return makeEndpointConfig(attributes.projectId, cloudIotConfig, attributes.deviceId);
+    ExecutionConfiguration executionConfiguration = makeExecutionConfiguration(attributes);
+    return makeEndpointConfig(attributes.projectId, executionConfiguration, attributes.deviceId);
   }
 
   /**
@@ -97,7 +97,7 @@ public static ClientInfo parseClientId(String clientId) {
   }
 
   public EndpointConfiguration makeEndpointConfig(String projectId, String deviceId) {
-    return makeEndpointConfig(projectId, cloudIotConfig, deviceId);
+    return makeEndpointConfig(projectId, executionConfiguration, deviceId);
   }
 
   private Set<String> getDeviceIds() {
@@ -159,7 +159,7 @@ private void loadSiteConfig() {
         "sitePath not defined in configuration");
     File cloudConfig = new File(new File(sitePath), "cloud_iot_config.json");
     try {
-      cloudIotConfig = OBJECT_MAPPER.readValue(cloudConfig, CloudIotConfig.class);
+      executionConfiguration = OBJECT_MAPPER.readValue(cloudConfig, ExecutionConfiguration.class);
     } catch (Exception e) {
       throw new RuntimeException("While reading config file " + cloudConfig.getAbsolutePath(), e);
     }
@@ -197,7 +197,7 @@ private String getDeviceKeyPrefix(String targetId) {
    * @return site registry
    */
   public String getRegistryId() {
-    return cloudIotConfig.registry_id;
+    return executionConfiguration.registry_id;
   }
 
   /**
@@ -206,7 +206,7 @@ public String getRegistryId() {
    * @return update topic
    */
   public String getUpdateTopic() {
-    return cloudIotConfig.update_topic;
+    return executionConfiguration.update_topic;
   }
 
   public Device getDevice(String deviceId) {
diff --git a/common/src/test/java/com/google/udmi/util/GeneralUtilsTest.java b/common/src/test/java/com/google/udmi/util/GeneralUtilsTest.java
new file mode 100644
index 0000000000..70a71c316e
--- /dev/null
+++ b/common/src/test/java/com/google/udmi/util/GeneralUtilsTest.java
@@ -0,0 +1,91 @@
+package com.google.udmi.util;
+
+import static com.google.udmi.util.GeneralUtils.deepCopy;
+import static com.google.udmi.util.GeneralUtils.mergeObject;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+
+/**
+ * Tests for general utilities.
+ */
+public class GeneralUtilsTest {
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void testDeepCopy() {
+    Map<String, Object> original = getBaseMap();
+    Map<String, Object> copy = deepCopy(original);
+    assertEquals("copy is equal", original, copy);
+    ((Map<String, String>) copy.get("C")).put("F", "H");
+    assertNotEquals("copy is not equal", original, copy);
+  }
+
+  private Map<String, Object> getBaseMap() {
+    Map<String, Object> original = new HashMap<>();
+    original.put("A", "B");
+    original.put("C", ImmutableMap.of("D", "E", "F", "G"));
+    return original;
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void testMergeObject() {
+    final Map<String, Object> target = deepCopy(getBaseMap());
+    final Map<String, Object> originalTarget = deepCopy(target);
+    final Map<String, Object> source = deepCopy(target);
+    source.put("X", "Y");
+    final Map<String, String> sourceC = (Map<String, String>) source.get("C");
+    sourceC.put("D", "Q");
+    sourceC.put("H", "I");
+    final Map<String, Object> originalSource = deepCopy(source);
+    mergeObject(target, source);
+    assertEquals("unmolested source", originalSource, source);
+    assertNotEquals("changed target", target, originalTarget);
+    assertNull("original X", originalTarget.get("X"));
+    assertEquals("target X", "Y", target.get("X"));
+    final Map<String, String> originalC = (Map<String, String>) originalTarget.get("C");
+    assertEquals("original C.D", "E", originalC.get("D"));
+    assertEquals("original C.F", "G", originalC.get("F"));
+    assertNull("original C.H", originalC.get("H"));
+    final Map<String, String> targetC = (Map<String, String>) target.get("C");
+    assertEquals("target C.D", "Q", targetC.get("D"));
+    assertEquals("target C.F", "G", targetC.get("F"));
+    assertEquals("target C.H", "I", targetC.get("H"));
+  }
+
+  @Test
+  public void testMergeTyped() {
+    Container source = new Container();
+    Container target = new Container();
+    source.anInt = 2;
+    source.bool = true;
+    target.string = "hello";
+    target.bool = false;
+    Container merged = mergeObject(target, source);
+    assertEquals("source a", 2, source.anInt);
+    assertEquals("target a", 0, target.anInt);
+    assertEquals("merged a", 2, merged.anInt);
+    assertNull("source b", source.string);
+    assertEquals("target b", "hello", target.string);
+    assertEquals("merged b", "hello", merged.string);
+    assertEquals("source c", true, source.bool);
+    assertEquals("target c", false, target.bool);
+    assertEquals("merged c", true, merged.bool);
+  }
+
+  /**
+   * Simple test container class.
+   */
+  public static class Container {
+
+    public int anInt;
+    public String string;
+    public Boolean bool;
+  }
+}
\ No newline at end of file
diff --git a/etc/validator.out b/etc/validator.out
index 4ca1d4cc21..43e162a3a5 100644
--- a/etc/validator.out
+++ b/etc/validator.out
@@ -25,7 +25,7 @@ sites/udmi_site_model/out/devices/AHU-1/event_pointset.out
   "sub_type" : "event",
   "status" : {
     "message" : "While converting to json node: 1 schema violations found",
-    "detail" : "While converting to json node: 1 schema violations found @Validator.validateMessage(Validator.java:417); 1 schema violations found; object instance has properties which are not allowed by the schema: [\"extraField\"]",
+    "detail" : "While converting to json node: 1 schema violations found @Validator.validateMessage(redacted); 1 schema violations found; object instance has properties which are not allowed by the schema: [\"extraField\"]",
     "category" : "validation.error.simple",
     "timestamp" : "1999-10-20T01:02:03Z",
     "level" : 500
diff --git a/gencode/docs/cloud_iot_config.html b/gencode/docs/cloud_iot_config.html
deleted file mode 100644
index ae0f0be4ff..0000000000
--- a/gencode/docs/cloud_iot_config.html
+++ /dev/null
@@ -1,201 +0,0 @@
-
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Overpass:300,400,600,800">
-    <script src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
-    <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
-	<link rel="stylesheet" type="text/css" href="schema_doc.css">
-    <script src="https://use.fontawesome.com/facf9fa52c.js"></script>
-    <script src="schema_doc.min.js"></script>
-    <meta charset="utf-8"/>
-        
-    
-    <title>Cloud Iot Config</title>
-<script src="schema_extras.js" ></script></head>
-    <body onload="anchorOnLoad();removedHostedMDExtensions();" id="root"><nav> <ol class="breadcrumb bg-white" style="padding: 0"> <li class="breadcrumb-item"><a href="../../">UDMI</a></li> <li class="breadcrumb-item"><a href="../">Schema</a></li> <li class="breadcrumb-item"><a href="./">Schema Viewer</a></li> </ol> </nav> <h1>Cloud Iot Config</h1><div class="text-right">
-            <button class="btn btn-primary" type="button" data-toggle="collapse" data-target=".collapse:not(.show)" aria-expanded="false">Expand all</button>
-            <button class="btn btn-primary" type="button" data-toggle="collapse" data-target=".collapse.show" aria-expanded="false">Collapse all</button>
-        </div>
-
-    <div class="breadcrumbs"></div><span class="badge badge-dark value-type">Type: object</span><br/>
-<span class="description"><p>Parameters for configuring a connection to cloud systems</p>
-</span> <span class="badge badge-info no-additional">No Additional Properties</span>
-            
-
-            
-            
-
-            
-<div class="accordion" id="accordionregistry_id">
-    <div class="card">
-        <div class="card-header" id="headingregistry_id">
-            <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#registry_id"
-                        aria-expanded="" aria-controls="registry_id" onclick="setAnchor('#registry_id')"><span class="property-name">registry_id</span></button>
-            </h2>
-        </div>
-
-        <div id="registry_id"
-             class="collapse property-definition-div" aria-labelledby="headingregistry_id"
-             data-parent="#accordionregistry_id">
-            <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="#registry_id" onclick="anchorLink('registry_id')">registry_id</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
-
-            
-
-            
-            
-
-            
-            </div>
-        </div>
-    </div>
-</div>
-<div class="accordion" id="accordioncloud_region">
-    <div class="card">
-        <div class="card-header" id="headingcloud_region">
-            <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#cloud_region"
-                        aria-expanded="" aria-controls="cloud_region" onclick="setAnchor('#cloud_region')"><span class="property-name">cloud_region</span></button>
-            </h2>
-        </div>
-
-        <div id="cloud_region"
-             class="collapse property-definition-div" aria-labelledby="headingcloud_region"
-             data-parent="#accordioncloud_region">
-            <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="#cloud_region" onclick="anchorLink('cloud_region')">cloud_region</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
-
-            
-
-            
-            
-
-            
-            </div>
-        </div>
-    </div>
-</div>
-<div class="accordion" id="accordionsite_name">
-    <div class="card">
-        <div class="card-header" id="headingsite_name">
-            <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#site_name"
-                        aria-expanded="" aria-controls="site_name" onclick="setAnchor('#site_name')"><span class="property-name">site_name</span></button>
-            </h2>
-        </div>
-
-        <div id="site_name"
-             class="collapse property-definition-div" aria-labelledby="headingsite_name"
-             data-parent="#accordionsite_name">
-            <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="#site_name" onclick="anchorLink('site_name')">site_name</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
-
-            
-
-            
-            
-
-            
-            </div>
-        </div>
-    </div>
-</div>
-<div class="accordion" id="accordionupdate_topic">
-    <div class="card">
-        <div class="card-header" id="headingupdate_topic">
-            <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#update_topic"
-                        aria-expanded="" aria-controls="update_topic" onclick="setAnchor('#update_topic')"><span class="property-name">update_topic</span></button>
-            </h2>
-        </div>
-
-        <div id="update_topic"
-             class="collapse property-definition-div" aria-labelledby="headingupdate_topic"
-             data-parent="#accordionupdate_topic">
-            <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="#update_topic" onclick="anchorLink('update_topic')">update_topic</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
-
-            
-
-            
-            
-
-            
-            </div>
-        </div>
-    </div>
-</div>
-<div class="accordion" id="accordionreflect_region">
-    <div class="card">
-        <div class="card-header" id="headingreflect_region">
-            <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#reflect_region"
-                        aria-expanded="" aria-controls="reflect_region" onclick="setAnchor('#reflect_region')"><span class="property-name">reflect_region</span></button>
-            </h2>
-        </div>
-
-        <div id="reflect_region"
-             class="collapse property-definition-div" aria-labelledby="headingreflect_region"
-             data-parent="#accordionreflect_region">
-            <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="#reflect_region" onclick="anchorLink('reflect_region')">reflect_region</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
-
-            
-
-            
-            
-
-            
-            </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>
-    </footer></body>
-</html>
\ No newline at end of file
diff --git a/gencode/docs/configuration_execution.html b/gencode/docs/configuration_execution.html
new file mode 100644
index 0000000000..bd9c123b6c
--- /dev/null
+++ b/gencode/docs/configuration_execution.html
@@ -0,0 +1,531 @@
+
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Overpass:300,400,600,800">
+    <script src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+    <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+	<link rel="stylesheet" type="text/css" href="schema_doc.css">
+    <script src="https://use.fontawesome.com/facf9fa52c.js"></script>
+    <script src="schema_doc.min.js"></script>
+    <meta charset="utf-8"/>
+        
+    
+    <title>Execution Configuration</title>
+<script src="schema_extras.js" ></script></head>
+    <body onload="anchorOnLoad();removedHostedMDExtensions();" id="root"><nav> <ol class="breadcrumb bg-white" style="padding: 0"> <li class="breadcrumb-item"><a href="../../">UDMI</a></li> <li class="breadcrumb-item"><a href="../">Schema</a></li> <li class="breadcrumb-item"><a href="./">Schema Viewer</a></li> </ol> </nav> <h1>Execution Configuration</h1><div class="text-right">
+            <button class="btn btn-primary" type="button" data-toggle="collapse" data-target=".collapse:not(.show)" aria-expanded="false">Expand all</button>
+            <button class="btn btn-primary" type="button" data-toggle="collapse" data-target=".collapse.show" aria-expanded="false">Collapse all</button>
+        </div>
+
+    <div class="breadcrumbs"></div><span class="badge badge-dark value-type">Type: object</span><br/>
+<span class="description"><p>Parameters for configuring the execution run of a UDMI tool</p>
+</span> <span class="badge badge-info no-additional">No Additional Properties</span>
+            
+
+            
+            
+
+            
+<div class="accordion" id="accordionregistry_id">
+    <div class="card">
+        <div class="card-header" id="headingregistry_id">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#registry_id"
+                        aria-expanded="" aria-controls="registry_id" onclick="setAnchor('#registry_id')"><span class="property-name">registry_id</span></button>
+            </h2>
+        </div>
+
+        <div id="registry_id"
+             class="collapse property-definition-div" aria-labelledby="headingregistry_id"
+             data-parent="#accordionregistry_id">
+            <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="#registry_id" onclick="anchorLink('registry_id')">registry_id</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordioncloud_region">
+    <div class="card">
+        <div class="card-header" id="headingcloud_region">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#cloud_region"
+                        aria-expanded="" aria-controls="cloud_region" onclick="setAnchor('#cloud_region')"><span class="property-name">cloud_region</span></button>
+            </h2>
+        </div>
+
+        <div id="cloud_region"
+             class="collapse property-definition-div" aria-labelledby="headingcloud_region"
+             data-parent="#accordioncloud_region">
+            <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="#cloud_region" onclick="anchorLink('cloud_region')">cloud_region</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordionsite_name">
+    <div class="card">
+        <div class="card-header" id="headingsite_name">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#site_name"
+                        aria-expanded="" aria-controls="site_name" onclick="setAnchor('#site_name')"><span class="property-name">site_name</span></button>
+            </h2>
+        </div>
+
+        <div id="site_name"
+             class="collapse property-definition-div" aria-labelledby="headingsite_name"
+             data-parent="#accordionsite_name">
+            <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="#site_name" onclick="anchorLink('site_name')">site_name</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordionupdate_topic">
+    <div class="card">
+        <div class="card-header" id="headingupdate_topic">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#update_topic"
+                        aria-expanded="" aria-controls="update_topic" onclick="setAnchor('#update_topic')"><span class="property-name">update_topic</span></button>
+            </h2>
+        </div>
+
+        <div id="update_topic"
+             class="collapse property-definition-div" aria-labelledby="headingupdate_topic"
+             data-parent="#accordionupdate_topic">
+            <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="#update_topic" onclick="anchorLink('update_topic')">update_topic</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordionreflect_region">
+    <div class="card">
+        <div class="card-header" id="headingreflect_region">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#reflect_region"
+                        aria-expanded="" aria-controls="reflect_region" onclick="setAnchor('#reflect_region')"><span class="property-name">reflect_region</span></button>
+            </h2>
+        </div>
+
+        <div id="reflect_region"
+             class="collapse property-definition-div" aria-labelledby="headingreflect_region"
+             data-parent="#accordionreflect_region">
+            <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="#reflect_region" onclick="anchorLink('reflect_region')">reflect_region</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordionsite_model">
+    <div class="card">
+        <div class="card-header" id="headingsite_model">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#site_model"
+                        aria-expanded="" aria-controls="site_model" onclick="setAnchor('#site_model')"><span class="property-name">site_model</span></button>
+            </h2>
+        </div>
+
+        <div id="site_model"
+             class="collapse property-definition-div" aria-labelledby="headingsite_model"
+             data-parent="#accordionsite_model">
+            <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="#site_model" onclick="anchorLink('site_model')">site_model</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordiondevice_id">
+    <div class="card">
+        <div class="card-header" id="headingdevice_id">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#device_id"
+                        aria-expanded="" aria-controls="device_id" onclick="setAnchor('#device_id')"><span class="property-name">device_id</span></button>
+            </h2>
+        </div>
+
+        <div id="device_id"
+             class="collapse property-definition-div" aria-labelledby="headingdevice_id"
+             data-parent="#accordiondevice_id">
+            <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="#device_id" onclick="anchorLink('device_id')">device_id</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordionproject_id">
+    <div class="card">
+        <div class="card-header" id="headingproject_id">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#project_id"
+                        aria-expanded="" aria-controls="project_id" onclick="setAnchor('#project_id')"><span class="property-name">project_id</span></button>
+            </h2>
+        </div>
+
+        <div id="project_id"
+             class="collapse property-definition-div" aria-labelledby="headingproject_id"
+             data-parent="#accordionproject_id">
+            <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="#project_id" onclick="anchorLink('project_id')">project_id</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordionkey_file">
+    <div class="card">
+        <div class="card-header" id="headingkey_file">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#key_file"
+                        aria-expanded="" aria-controls="key_file" onclick="setAnchor('#key_file')"><span class="property-name">key_file</span></button>
+            </h2>
+        </div>
+
+        <div id="key_file"
+             class="collapse property-definition-div" aria-labelledby="headingkey_file"
+             data-parent="#accordionkey_file">
+            <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="#key_file" onclick="anchorLink('key_file')">key_file</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordionserial_no">
+    <div class="card">
+        <div class="card-header" id="headingserial_no">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#serial_no"
+                        aria-expanded="" aria-controls="serial_no" onclick="setAnchor('#serial_no')"><span class="property-name">serial_no</span></button>
+            </h2>
+        </div>
+
+        <div id="serial_no"
+             class="collapse property-definition-div" aria-labelledby="headingserial_no"
+             data-parent="#accordionserial_no">
+            <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="#serial_no" onclick="anchorLink('serial_no')">serial_no</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordionlog_level">
+    <div class="card">
+        <div class="card-header" id="headinglog_level">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#log_level"
+                        aria-expanded="" aria-controls="log_level" onclick="setAnchor('#log_level')"><span class="property-name">log_level</span></button>
+            </h2>
+        </div>
+
+        <div id="log_level"
+             class="collapse property-definition-div" aria-labelledby="headinglog_level"
+             data-parent="#accordionlog_level">
+            <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="#log_level" onclick="anchorLink('log_level')">log_level</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordionudmi_version">
+    <div class="card">
+        <div class="card-header" id="headingudmi_version">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#udmi_version"
+                        aria-expanded="" aria-controls="udmi_version" onclick="setAnchor('#udmi_version')"><span class="property-name">udmi_version</span></button>
+            </h2>
+        </div>
+
+        <div id="udmi_version"
+             class="collapse property-definition-div" aria-labelledby="headingudmi_version"
+             data-parent="#accordionudmi_version">
+            <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="#udmi_version" onclick="anchorLink('udmi_version')">udmi_version</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordionalt_project">
+    <div class="card">
+        <div class="card-header" id="headingalt_project">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#alt_project"
+                        aria-expanded="" aria-controls="alt_project" onclick="setAnchor('#alt_project')"><span class="property-name">alt_project</span></button>
+            </h2>
+        </div>
+
+        <div id="alt_project"
+             class="collapse property-definition-div" aria-labelledby="headingalt_project"
+             data-parent="#accordionalt_project">
+            <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="#alt_project" onclick="anchorLink('alt_project')">alt_project</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordionalt_registry">
+    <div class="card">
+        <div class="card-header" id="headingalt_registry">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#alt_registry"
+                        aria-expanded="" aria-controls="alt_registry" onclick="setAnchor('#alt_registry')"><span class="property-name">alt_registry</span></button>
+            </h2>
+        </div>
+
+        <div id="alt_registry"
+             class="collapse property-definition-div" aria-labelledby="headingalt_registry"
+             data-parent="#accordionalt_registry">
+            <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="#alt_registry" onclick="anchorLink('alt_registry')">alt_registry</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+
+            
+
+            
+            
+
+            
+            </div>
+        </div>
+    </div>
+</div>
+<div class="accordion" id="accordionblock_unknown">
+    <div class="card">
+        <div class="card-header" id="headingblock_unknown">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#block_unknown"
+                        aria-expanded="" aria-controls="block_unknown" onclick="setAnchor('#block_unknown')"><span class="property-name">block_unknown</span></button>
+            </h2>
+        </div>
+
+        <div id="block_unknown"
+             class="collapse property-definition-div" aria-labelledby="headingblock_unknown"
+             data-parent="#accordionblock_unknown">
+            <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="#block_unknown" onclick="anchorLink('block_unknown')">block_unknown</a></div><span class="badge badge-dark value-type">Type: boolean</span><br/>
+
+            
+
+            
+            
+
+            
+            </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>
+    </footer></body>
+</html>
\ No newline at end of file
diff --git a/gencode/docs/readme.md b/gencode/docs/readme.md
index a69eb18abb..6906b4b039 100644
--- a/gencode/docs/readme.md
+++ b/gencode/docs/readme.md
@@ -14,7 +14,6 @@
 * [**state**](state.html) - [State](../../docs/messages/state.md) message, defined by [`state.json`]
 
 ## Site Model
-* [**cloud_iot_config**](cloud_iot_config.html) - Parameters for configuring a connection to cloud systems
 * [**metadata**](metadata.html) - [Metadata](../../docs/specs/metadata.md) is a description about the device: a specification about how the device should be configured and expectations about what the device should be doing. Defined by `metadata.json`
 
 ## Blobs
@@ -24,6 +23,7 @@
 * [**command_discovery**](command_discovery.html) - [Discovery command](../../docs/specs/discovery.md) for provisioning
 * [**command_mapping**](command_mapping.html) - [Mapping command](../../docs/specs/mapping.md) for provisioning
 * [**config_mapping**](config_mapping.html) - Configuration for [mapping](../../docs/specs/mapping.md)
+* [**configuration_execution**](configuration_execution.html) - Parameters for configuring the execution run of a UDMI tool
 * [**configuration_pubber**](configuration_pubber.html) - Parameters to define a pubber runtime instance
 * [**event**](event.html) - Container object for all event schemas, not directly used.
 * [**event_mapping**](event_mapping.html) - [Mapping result](../../docs/specs/mapping.md) with implicit enumeration
diff --git a/gencode/java/udmi/schema/CloudIotConfig.java b/gencode/java/udmi/schema/CloudIotConfig.java
deleted file mode 100644
index fbafa456ea..0000000000
--- a/gencode/java/udmi/schema/CloudIotConfig.java
+++ /dev/null
@@ -1,61 +0,0 @@
-
-package udmi.schema;
-
-import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-
-/**
- * Cloud Iot Config
- * <p>
- * Parameters for configuring a connection to cloud systems
- * 
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "registry_id",
-    "cloud_region",
-    "site_name",
-    "update_topic",
-    "reflect_region"
-})
-@Generated("jsonschema2pojo")
-public class CloudIotConfig {
-
-    @JsonProperty("registry_id")
-    public String registry_id;
-    @JsonProperty("cloud_region")
-    public String cloud_region;
-    @JsonProperty("site_name")
-    public String site_name;
-    @JsonProperty("update_topic")
-    public String update_topic;
-    @JsonProperty("reflect_region")
-    public String reflect_region;
-
-    @Override
-    public int hashCode() {
-        int result = 1;
-        result = ((result* 31)+((this.site_name == null)? 0 :this.site_name.hashCode()));
-        result = ((result* 31)+((this.cloud_region == null)? 0 :this.cloud_region.hashCode()));
-        result = ((result* 31)+((this.update_topic == null)? 0 :this.update_topic.hashCode()));
-        result = ((result* 31)+((this.registry_id == null)? 0 :this.registry_id.hashCode()));
-        result = ((result* 31)+((this.reflect_region == null)? 0 :this.reflect_region.hashCode()));
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-        if ((other instanceof CloudIotConfig) == false) {
-            return false;
-        }
-        CloudIotConfig rhs = ((CloudIotConfig) other);
-        return ((((((this.site_name == rhs.site_name)||((this.site_name!= null)&&this.site_name.equals(rhs.site_name)))&&((this.cloud_region == rhs.cloud_region)||((this.cloud_region!= null)&&this.cloud_region.equals(rhs.cloud_region))))&&((this.update_topic == rhs.update_topic)||((this.update_topic!= null)&&this.update_topic.equals(rhs.update_topic))))&&((this.registry_id == rhs.registry_id)||((this.registry_id!= null)&&this.registry_id.equals(rhs.registry_id))))&&((this.reflect_region == rhs.reflect_region)||((this.reflect_region!= null)&&this.reflect_region.equals(rhs.reflect_region))));
-    }
-
-}
diff --git a/gencode/java/udmi/schema/ExecutionConfiguration.java b/gencode/java/udmi/schema/ExecutionConfiguration.java
new file mode 100644
index 0000000000..9f9482799c
--- /dev/null
+++ b/gencode/java/udmi/schema/ExecutionConfiguration.java
@@ -0,0 +1,101 @@
+
+package udmi.schema;
+
+import javax.annotation.processing.Generated;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+
+/**
+ * Execution Configuration
+ * <p>
+ * Parameters for configuring the execution run of a UDMI tool
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "registry_id",
+    "cloud_region",
+    "site_name",
+    "update_topic",
+    "reflect_region",
+    "site_model",
+    "device_id",
+    "project_id",
+    "key_file",
+    "serial_no",
+    "log_level",
+    "udmi_version",
+    "alt_project",
+    "alt_registry",
+    "block_unknown"
+})
+@Generated("jsonschema2pojo")
+public class ExecutionConfiguration {
+
+    @JsonProperty("registry_id")
+    public String registry_id;
+    @JsonProperty("cloud_region")
+    public String cloud_region;
+    @JsonProperty("site_name")
+    public String site_name;
+    @JsonProperty("update_topic")
+    public String update_topic;
+    @JsonProperty("reflect_region")
+    public String reflect_region;
+    @JsonProperty("site_model")
+    public String site_model;
+    @JsonProperty("device_id")
+    public String device_id;
+    @JsonProperty("project_id")
+    public String project_id;
+    @JsonProperty("key_file")
+    public String key_file;
+    @JsonProperty("serial_no")
+    public String serial_no;
+    @JsonProperty("log_level")
+    public String log_level;
+    @JsonProperty("udmi_version")
+    public String udmi_version;
+    @JsonProperty("alt_project")
+    public String alt_project;
+    @JsonProperty("alt_registry")
+    public String alt_registry;
+    @JsonProperty("block_unknown")
+    public Boolean block_unknown;
+
+    @Override
+    public int hashCode() {
+        int result = 1;
+        result = ((result* 31)+((this.alt_registry == null)? 0 :this.alt_registry.hashCode()));
+        result = ((result* 31)+((this.block_unknown == null)? 0 :this.block_unknown.hashCode()));
+        result = ((result* 31)+((this.cloud_region == null)? 0 :this.cloud_region.hashCode()));
+        result = ((result* 31)+((this.device_id == null)? 0 :this.device_id.hashCode()));
+        result = ((result* 31)+((this.key_file == null)? 0 :this.key_file.hashCode()));
+        result = ((result* 31)+((this.udmi_version == null)? 0 :this.udmi_version.hashCode()));
+        result = ((result* 31)+((this.alt_project == null)? 0 :this.alt_project.hashCode()));
+        result = ((result* 31)+((this.log_level == null)? 0 :this.log_level.hashCode()));
+        result = ((result* 31)+((this.site_model == null)? 0 :this.site_model.hashCode()));
+        result = ((result* 31)+((this.registry_id == null)? 0 :this.registry_id.hashCode()));
+        result = ((result* 31)+((this.site_name == null)? 0 :this.site_name.hashCode()));
+        result = ((result* 31)+((this.update_topic == null)? 0 :this.update_topic.hashCode()));
+        result = ((result* 31)+((this.project_id == null)? 0 :this.project_id.hashCode()));
+        result = ((result* 31)+((this.serial_no == null)? 0 :this.serial_no.hashCode()));
+        result = ((result* 31)+((this.reflect_region == null)? 0 :this.reflect_region.hashCode()));
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof ExecutionConfiguration) == false) {
+            return false;
+        }
+        ExecutionConfiguration rhs = ((ExecutionConfiguration) other);
+        return ((((((((((((((((this.alt_registry == rhs.alt_registry)||((this.alt_registry!= null)&&this.alt_registry.equals(rhs.alt_registry)))&&((this.block_unknown == rhs.block_unknown)||((this.block_unknown!= null)&&this.block_unknown.equals(rhs.block_unknown))))&&((this.cloud_region == rhs.cloud_region)||((this.cloud_region!= null)&&this.cloud_region.equals(rhs.cloud_region))))&&((this.device_id == rhs.device_id)||((this.device_id!= null)&&this.device_id.equals(rhs.device_id))))&&((this.key_file == rhs.key_file)||((this.key_file!= null)&&this.key_file.equals(rhs.key_file))))&&((this.udmi_version == rhs.udmi_version)||((this.udmi_version!= null)&&this.udmi_version.equals(rhs.udmi_version))))&&((this.alt_project == rhs.alt_project)||((this.alt_project!= null)&&this.alt_project.equals(rhs.alt_project))))&&((this.log_level == rhs.log_level)||((this.log_level!= null)&&this.log_level.equals(rhs.log_level))))&&((this.site_model == rhs.site_model)||((this.site_model!= null)&&this.site_model.equals(rhs.site_model))))&&((this.registry_id == rhs.registry_id)||((this.registry_id!= null)&&this.registry_id.equals(rhs.registry_id))))&&((this.site_name == rhs.site_name)||((this.site_name!= null)&&this.site_name.equals(rhs.site_name))))&&((this.update_topic == rhs.update_topic)||((this.update_topic!= null)&&this.update_topic.equals(rhs.update_topic))))&&((this.project_id == rhs.project_id)||((this.project_id!= null)&&this.project_id.equals(rhs.project_id))))&&((this.serial_no == rhs.serial_no)||((this.serial_no!= null)&&this.serial_no.equals(rhs.serial_no))))&&((this.reflect_region == rhs.reflect_region)||((this.reflect_region!= null)&&this.reflect_region.equals(rhs.reflect_region))));
+    }
+
+}
diff --git a/gencode/python/udmi/schema/__init__.py b/gencode/python/udmi/schema/__init__.py
index 5e25d1f284..3df63ea23a 100644
--- a/gencode/python/udmi/schema/__init__.py
+++ b/gencode/python/udmi/schema/__init__.py
@@ -2,7 +2,6 @@
 from .building_config import BuildingConfig
 from .building_translation import BuildingTranslation
 from .category import ObjectC50A4669
-from .cloud_iot_config import CloudIotConfig
 from .command_discovery import DiscoveryCommand
 from .command_mapping import MappingCommand
 from .common import Common
@@ -20,6 +19,7 @@
 from .config_system import SystemConfig
 from .config_system_testing import TestingSystemConfig
 from .configuration_endpoint import EndpointConfiguration
+from .configuration_execution import ExecutionConfiguration
 from .configuration_pubber import PubberConfiguration
 from .envelope import Envelope
 from .event import Event
diff --git a/gencode/python/udmi/schema/cloud_iot_config.py b/gencode/python/udmi/schema/cloud_iot_config.py
deleted file mode 100644
index 2bf7b4f51c..0000000000
--- a/gencode/python/udmi/schema/cloud_iot_config.py
+++ /dev/null
@@ -1,54 +0,0 @@
-"""Generated class for cloud_iot_config.json"""
-
-
-class CloudIotConfig:
-  """Generated schema class"""
-
-  def __init__(self):
-    self.registry_id = None
-    self.cloud_region = None
-    self.site_name = None
-    self.update_topic = None
-    self.reflect_region = None
-
-  @staticmethod
-  def from_dict(source):
-    if not source:
-      return None
-    result = CloudIotConfig()
-    result.registry_id = source.get('registry_id')
-    result.cloud_region = source.get('cloud_region')
-    result.site_name = source.get('site_name')
-    result.update_topic = source.get('update_topic')
-    result.reflect_region = source.get('reflect_region')
-    return result
-
-  @staticmethod
-  def map_from(source):
-    if not source:
-      return None
-    result = {}
-    for key in source:
-      result[key] = CloudIotConfig.from_dict(source[key])
-    return result
-
-  @staticmethod
-  def expand_dict(input):
-    result = {}
-    for property in input:
-      result[property] = input[property].to_dict() if input[property] else {}
-    return result
-
-  def to_dict(self):
-    result = {}
-    if self.registry_id:
-      result['registry_id'] = self.registry_id # 5
-    if self.cloud_region:
-      result['cloud_region'] = self.cloud_region # 5
-    if self.site_name:
-      result['site_name'] = self.site_name # 5
-    if self.update_topic:
-      result['update_topic'] = self.update_topic # 5
-    if self.reflect_region:
-      result['reflect_region'] = self.reflect_region # 5
-    return result
diff --git a/gencode/python/udmi/schema/configuration_execution.py b/gencode/python/udmi/schema/configuration_execution.py
new file mode 100644
index 0000000000..b3b97105f7
--- /dev/null
+++ b/gencode/python/udmi/schema/configuration_execution.py
@@ -0,0 +1,94 @@
+"""Generated class for configuration_execution.json"""
+
+
+class ExecutionConfiguration:
+  """Generated schema class"""
+
+  def __init__(self):
+    self.registry_id = None
+    self.cloud_region = None
+    self.site_name = None
+    self.update_topic = None
+    self.reflect_region = None
+    self.site_model = None
+    self.device_id = None
+    self.project_id = None
+    self.key_file = None
+    self.serial_no = None
+    self.log_level = None
+    self.udmi_version = None
+    self.alt_project = None
+    self.alt_registry = None
+    self.block_unknown = None
+
+  @staticmethod
+  def from_dict(source):
+    if not source:
+      return None
+    result = ExecutionConfiguration()
+    result.registry_id = source.get('registry_id')
+    result.cloud_region = source.get('cloud_region')
+    result.site_name = source.get('site_name')
+    result.update_topic = source.get('update_topic')
+    result.reflect_region = source.get('reflect_region')
+    result.site_model = source.get('site_model')
+    result.device_id = source.get('device_id')
+    result.project_id = source.get('project_id')
+    result.key_file = source.get('key_file')
+    result.serial_no = source.get('serial_no')
+    result.log_level = source.get('log_level')
+    result.udmi_version = source.get('udmi_version')
+    result.alt_project = source.get('alt_project')
+    result.alt_registry = source.get('alt_registry')
+    result.block_unknown = source.get('block_unknown')
+    return result
+
+  @staticmethod
+  def map_from(source):
+    if not source:
+      return None
+    result = {}
+    for key in source:
+      result[key] = ExecutionConfiguration.from_dict(source[key])
+    return result
+
+  @staticmethod
+  def expand_dict(input):
+    result = {}
+    for property in input:
+      result[property] = input[property].to_dict() if input[property] else {}
+    return result
+
+  def to_dict(self):
+    result = {}
+    if self.registry_id:
+      result['registry_id'] = self.registry_id # 5
+    if self.cloud_region:
+      result['cloud_region'] = self.cloud_region # 5
+    if self.site_name:
+      result['site_name'] = self.site_name # 5
+    if self.update_topic:
+      result['update_topic'] = self.update_topic # 5
+    if self.reflect_region:
+      result['reflect_region'] = self.reflect_region # 5
+    if self.site_model:
+      result['site_model'] = self.site_model # 5
+    if self.device_id:
+      result['device_id'] = self.device_id # 5
+    if self.project_id:
+      result['project_id'] = self.project_id # 5
+    if self.key_file:
+      result['key_file'] = self.key_file # 5
+    if self.serial_no:
+      result['serial_no'] = self.serial_no # 5
+    if self.log_level:
+      result['log_level'] = self.log_level # 5
+    if self.udmi_version:
+      result['udmi_version'] = self.udmi_version # 5
+    if self.alt_project:
+      result['alt_project'] = self.alt_project # 5
+    if self.alt_registry:
+      result['alt_registry'] = self.alt_registry # 5
+    if self.block_unknown:
+      result['block_unknown'] = self.block_unknown # 5
+    return result
diff --git a/pubber/src/main/java/daq/pubber/Pubber.java b/pubber/src/main/java/daq/pubber/Pubber.java
index c42458f05d..4178c370c0 100644
--- a/pubber/src/main/java/daq/pubber/Pubber.java
+++ b/pubber/src/main/java/daq/pubber/Pubber.java
@@ -937,8 +937,7 @@ private void maybeRedirectEndpoint() {
 
   private String redirectedEndpoint(String redirectRegistry) {
     try {
-      EndpointConfiguration endpoint = deepCopy(configuration.endpoint,
-          EndpointConfiguration.class);
+      EndpointConfiguration endpoint = deepCopy(configuration.endpoint);
       endpoint.client_id = getClientId(redirectRegistry);
       return toJsonString(endpoint);
     } catch (Exception e) {
diff --git a/schema/cloud_iot_config.json b/schema/cloud_iot_config.json
deleted file mode 100644
index a4028f4daf..0000000000
--- a/schema/cloud_iot_config.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "title": "Cloud Iot Config",
-  "description": "Parameters for configuring a connection to cloud systems",
-  "$section": "Site Model",
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "additionalProperties": false,
-  "properties": {
-    "registry_id": {
-      "type": "string"
-    },
-    "cloud_region": {
-      "type": "string"
-    },
-    "site_name": {
-      "type": "string"
-    },
-    "update_topic": {
-      "type": "string"
-    },
-    "reflect_region": {
-      "type": "string"
-    }
-  }  
-}
diff --git a/schema/configuration_execution.json b/schema/configuration_execution.json
new file mode 100644
index 0000000000..6c92c768c8
--- /dev/null
+++ b/schema/configuration_execution.json
@@ -0,0 +1,55 @@
+{
+  "title": "Execution Configuration",
+  "description": "Parameters for configuring the execution run of a UDMI tool",
+  "$section": "Tool Configuration",
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "additionalProperties": false,
+  "properties": {
+    "registry_id": {
+      "type": "string"
+    },
+    "cloud_region": {
+      "type": "string"
+    },
+    "site_name": {
+      "type": "string"
+    },
+    "update_topic": {
+      "type": "string"
+    },
+    "reflect_region": {
+      "type": "string"
+    },
+    "site_model": {
+      "type": "string"
+    },
+    "device_id": {
+      "type": "string"
+    },
+    "project_id": {
+      "type": "string"
+    },
+    "key_file": {
+      "type": "string"
+    },
+    "serial_no": {
+      "type": "string"
+    },
+    "log_level": {
+      "type": "string"
+    },
+    "udmi_version": {
+      "type": "string"
+    },
+    "alt_project": {
+      "type": "string"
+    },
+    "alt_registry": {
+      "type": "string"
+    },
+    "block_unknown": {
+      "type": "boolean"
+    }
+  }
+}
diff --git a/tests/cloud_iot_config.tests/cloud_iot_config.json b/tests/configuration_execution.tests/cloud_iot_config.json
similarity index 100%
rename from tests/cloud_iot_config.tests/cloud_iot_config.json
rename to tests/configuration_execution.tests/cloud_iot_config.json
diff --git a/tests/cloud_iot_config.tests/cloud_iot_config.out b/tests/configuration_execution.tests/cloud_iot_config.out
similarity index 100%
rename from tests/cloud_iot_config.tests/cloud_iot_config.out
rename to tests/configuration_execution.tests/cloud_iot_config.out
diff --git a/validator/.idea/runConfigurations/Registrar.xml b/validator/.idea/runConfigurations/Registrar.xml
index af305a1e0b..6b8b5e0301 100644
--- a/validator/.idea/runConfigurations/Registrar.xml
+++ b/validator/.idea/runConfigurations/Registrar.xml
@@ -2,11 +2,11 @@
   <configuration default="false" name="Registrar" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="com.google.daq.mqtt.registrar.Registrar" />
     <module name="validator" />
-    <option name="PROGRAM_PARAMETERS" value="-s tests/downgrade.site" />
+    <option name="PROGRAM_PARAMETERS" value="-s sites/udmi_site_model" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="com.google.daq.mqtt.util.*" />
+        <option name="PATTERN" value="com.google.udmi.util.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>
diff --git a/validator/.idea/runConfigurations/Validator.xml b/validator/.idea/runConfigurations/Validator.xml
deleted file mode 100644
index b97dfcda60..0000000000
--- a/validator/.idea/runConfigurations/Validator.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Validator" type="Application" factoryName="Application">
-    <option name="MAIN_CLASS_NAME" value="com.google.daq.mqtt.validator.Validator" />
-    <module name="validator" />
-    <option name="PROGRAM_PARAMETERS" value="-p bos-peringknife-dev -s sites/udmi_site_model" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="com.google.daq.mqtt.validator.semantic.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/validator/.idea/runConfigurations/Validator_Remote.xml b/validator/.idea/runConfigurations/Validator_Remote.xml
new file mode 100644
index 0000000000..b845d80ebc
--- /dev/null
+++ b/validator/.idea/runConfigurations/Validator_Remote.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Validator Remote" type="Remote">
+    <module name="validator" />
+    <option name="USE_SOCKET_TRANSPORT" value="true" />
+    <option name="SERVER_MODE" value="false" />
+    <option name="SHMEM_ADDRESS" />
+    <option name="HOST" value="localhost" />
+    <option name="PORT" value="5005" />
+    <option name="AUTO_RESTART" value="false" />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="5005" />
+      <option name="LOCAL" value="false" />
+    </RunnerSettings>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/validator/bin/validate b/validator/bin/validate
index 6c1a6405ee..c72d61e85c 100755
--- a/validator/bin/validate
+++ b/validator/bin/validate
@@ -23,10 +23,8 @@ fi
 
 jarfile=validator/build/libs/validator-1.0-SNAPSHOT-all.jar
 
-if [ ! -f $jarfile ]; then
-    echo Building validator...
-    validator/bin/build
-fi
+echo Building validator...
+validator/bin/build
 
 auth_type=`jq -r .type ~/.config/gcloud/application_default_credentials.json || true`
 echo Application default credentials auth type ${auth_type:-unknown}
diff --git a/validator/build.gradle b/validator/build.gradle
index 8b1ef18dcc..524b683303 100644
--- a/validator/build.gradle
+++ b/validator/build.gradle
@@ -29,6 +29,11 @@ sourceSets {
             srcDirs '../common/src/main/java'
         }
     }
+    test {
+        java {
+            srcDirs '../common/src/test/java'
+        }
+    }
 }
 
 checkstyle {
diff --git a/validator/src/main/java/com/google/bos/iot/core/proxy/CloudIotManager.java b/validator/src/main/java/com/google/bos/iot/core/proxy/CloudIotManager.java
index 2fc4506d8d..34e7c14233 100644
--- a/validator/src/main/java/com/google/bos/iot/core/proxy/CloudIotManager.java
+++ b/validator/src/main/java/com/google/bos/iot/core/proxy/CloudIotManager.java
@@ -13,7 +13,6 @@
 import com.google.api.services.cloudiot.v1.model.ModifyCloudToDeviceConfigRequest;
 import com.google.auth.http.HttpCredentialsAdapter;
 import com.google.auth.oauth2.GoogleCredentials;
-import com.google.daq.mqtt.util.CloudIotConfig;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.HashMap;
@@ -23,6 +22,7 @@
 import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import udmi.schema.ExecutionConfiguration;
 
 /**
  * General functions for managing the connection with IoT Core.
@@ -31,13 +31,13 @@ public class CloudIotManager {
 
   private static final Logger LOG = LoggerFactory.getLogger(CloudIotManager.class);
   private static final String APPLICATION_NAME = "iot_core_proxy";
-  private final CloudIotConfig iotConfig;
+  private final ExecutionConfiguration iotConfig;
   private final CloudIot cloudIot;
   private final String projectId;
   private final String projectPath;
   private final String registryId;
-  private Map<String, Device> deviceMap = new HashMap<>();
-  private CloudIot.Projects.Locations.Registries cloudIotRegistries;
+  private final Map<String, Device> deviceMap = new HashMap<>();
+  private final CloudIot.Projects.Locations.Registries cloudIotRegistries;
 
   /**
    * Create a manager with the given configuration.
@@ -45,7 +45,7 @@ public class CloudIotManager {
    * @param projectId Cloud project ID.
    * @param iotConfig Configuration parameters.
    */
-  CloudIotManager(String projectId, CloudIotConfig iotConfig) {
+  CloudIotManager(String projectId, ExecutionConfiguration iotConfig) {
     this.projectId = projectId;
     this.iotConfig = iotConfig;
     projectPath = "projects/" + projectId + "/locations/" + iotConfig.cloud_region;
diff --git a/validator/src/main/java/com/google/bos/iot/core/proxy/IotReflectorClient.java b/validator/src/main/java/com/google/bos/iot/core/proxy/IotReflectorClient.java
index 6dc2fb7100..92a7eda67e 100644
--- a/validator/src/main/java/com/google/bos/iot/core/proxy/IotReflectorClient.java
+++ b/validator/src/main/java/com/google/bos/iot/core/proxy/IotReflectorClient.java
@@ -5,7 +5,6 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.google.api.client.util.Base64;
 import com.google.common.collect.ImmutableSet;
-import com.google.daq.mqtt.util.CloudIotConfig;
 import com.google.daq.mqtt.util.MessagePublisher;
 import java.io.File;
 import java.nio.file.Files;
@@ -18,6 +17,7 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.function.BiConsumer;
+import udmi.schema.ExecutionConfiguration;
 
 /**
  * Publish messages using the iot core reflector.
@@ -47,9 +47,9 @@ public class IotReflectorClient implements MessagePublisher {
    *
    * @param projectId target project
    * @param iotConfig configuration file
-   * @param keyFile auth key file
+   * @param keyFile   auth key file
    */
-  public IotReflectorClient(String projectId, CloudIotConfig iotConfig, String keyFile) {
+  public IotReflectorClient(String projectId, ExecutionConfiguration iotConfig, String keyFile) {
     final byte[] keyBytes;
     try {
       keyBytes = getFileBytes(keyFile);
diff --git a/validator/src/main/java/com/google/bos/iot/core/proxy/ProxyTarget.java b/validator/src/main/java/com/google/bos/iot/core/proxy/ProxyTarget.java
index cd3cc67442..8a77a419a5 100644
--- a/validator/src/main/java/com/google/bos/iot/core/proxy/ProxyTarget.java
+++ b/validator/src/main/java/com/google/bos/iot/core/proxy/ProxyTarget.java
@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
 import com.google.api.services.cloudiot.v1.model.Device;
 import com.google.cloud.ServiceOptions;
-import com.google.daq.mqtt.util.CloudIotConfig;
 import com.google.daq.mqtt.util.MessagePublisher;
 import java.time.Duration;
 import java.time.LocalDateTime;
@@ -19,6 +18,7 @@
 import java.util.function.Consumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import udmi.schema.ExecutionConfiguration;
 import udmi.schema.Metadata;
 
 class ProxyTarget {
@@ -43,11 +43,11 @@ class ProxyTarget {
   private final String srcRegistryId;
   private final ProxyConfig proxyConfig;
   private final Consumer<MessageBundle> bundleOut;
-  private CloudIotConfig cloudConfig;
-  private CloudIotManager cloudIotManager;
   private final Map<String, LocalDateTime> initializedTimes = new ConcurrentHashMap<>();
   private final Map<String, LocalDateTime> configTimes = new ConcurrentHashMap<>();
   private final Map<String, Metadata> udmiMetadata = new ConcurrentHashMap<>();
+  private ExecutionConfiguration cloudConfig;
+  private CloudIotManager cloudIotManager;
 
   ProxyTarget(Map<String, String> configMap, String registryId,
       Consumer<MessageBundle> bundleOut) {
@@ -102,11 +102,11 @@ private String getKeyPrefix(String srcRegistryId) {
     return String.format("proxy_%s_", srcRegistryId);
   }
 
-  private CloudIotConfig loadCloudConfig(String srcRegistryId) {
-    CloudIotConfig cloudIotConfig = new CloudIotConfig();
-    cloudIotConfig.registry_id = srcRegistryId;
-    cloudIotConfig.cloud_region = proxyConfig.dstCloudRegion;
-    return cloudIotConfig;
+  private ExecutionConfiguration loadCloudConfig(String srcRegistryId) {
+    ExecutionConfiguration executionConfiguration = new ExecutionConfiguration();
+    executionConfiguration.registry_id = srcRegistryId;
+    executionConfiguration.cloud_region = proxyConfig.dstCloudRegion;
+    return executionConfiguration;
   }
 
   MessagePublisher getMqttPublisher(String deviceId) {
diff --git a/validator/src/main/java/com/google/daq/mqtt/mapping/MappingAgent.java b/validator/src/main/java/com/google/daq/mqtt/mapping/MappingAgent.java
index 1fde5817f6..6239a15a64 100644
--- a/validator/src/main/java/com/google/daq/mqtt/mapping/MappingAgent.java
+++ b/validator/src/main/java/com/google/daq/mqtt/mapping/MappingAgent.java
@@ -1,9 +1,9 @@
 package com.google.daq.mqtt.mapping;
 
 import com.google.common.collect.ImmutableList;
-import com.google.daq.mqtt.util.JsonUtil;
 import com.google.daq.mqtt.util.MessageHandler;
 import com.google.daq.mqtt.util.MessageHandler.HandlerSpecification;
+import com.google.udmi.util.JsonUtil;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -18,7 +18,6 @@
 import udmi.schema.FamilyDiscoveryState;
 import udmi.schema.MappingCommand;
 import udmi.schema.MappingEvent;
-import udmi.schema.ValidationState;
 
 /**
  * Agent that maps discovery results to mapping requests.
@@ -28,11 +27,11 @@ public class MappingAgent extends MappingBase {
   private static final int SCAN_INTERVAL_SEC = 60;
   private static final String DISCOVERY_FAMILY = "virtual";
   private final Map<String, FamilyDiscoveryState> familyStates = new HashMap<>();
+  private MappingSink mappingSink;
   private final List<HandlerSpecification> handlers = ImmutableList.of(
       MessageHandler.handlerSpecification(DiscoveryState.class, this::discoveryStateHandler),
       MessageHandler.handlerSpecification(MappingEvent.class, this::mappingEventHandler)
   );
-  private MappingSink mappingSink;
 
   /**
    * Main entry point for the mapping agent.
diff --git a/validator/src/main/java/com/google/daq/mqtt/mapping/MappingEngine.java b/validator/src/main/java/com/google/daq/mqtt/mapping/MappingEngine.java
index e44bd13d27..9ecbce3e4a 100644
--- a/validator/src/main/java/com/google/daq/mqtt/mapping/MappingEngine.java
+++ b/validator/src/main/java/com/google/daq/mqtt/mapping/MappingEngine.java
@@ -1,9 +1,9 @@
 package com.google.daq.mqtt.mapping;
 
 import com.google.common.collect.ImmutableList;
-import com.google.daq.mqtt.util.JsonUtil;
 import com.google.daq.mqtt.util.MessageHandler;
 import com.google.daq.mqtt.util.MessageHandler.HandlerSpecification;
+import com.google.udmi.util.JsonUtil;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Date;
 import java.util.HashMap;
diff --git a/validator/src/main/java/com/google/daq/mqtt/mapping/MappingSink.java b/validator/src/main/java/com/google/daq/mqtt/mapping/MappingSink.java
index 9e49b6039b..ea594f38ab 100644
--- a/validator/src/main/java/com/google/daq/mqtt/mapping/MappingSink.java
+++ b/validator/src/main/java/com/google/daq/mqtt/mapping/MappingSink.java
@@ -1,8 +1,8 @@
 package com.google.daq.mqtt.mapping;
 
-import static com.google.daq.mqtt.util.JsonUtil.loadFile;
+import static com.google.udmi.util.JsonUtil.loadFile;
 
-import com.google.daq.mqtt.util.JsonUtil;
+import com.google.udmi.util.JsonUtil;
 import com.google.udmi.util.SiteModel;
 import java.io.File;
 import java.util.HashMap;
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 3c34d8e2d0..a293d5d889 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
@@ -1,5 +1,7 @@
 package com.google.daq.mqtt.registrar;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
 import static com.google.daq.mqtt.registrar.Registrar.DEVICE_ERRORS_JSON;
 import static com.google.daq.mqtt.registrar.Registrar.ENVELOPE_JSON;
 import static com.google.daq.mqtt.registrar.Registrar.GENERATED_CONFIG_JSON;
@@ -7,6 +9,7 @@
 import static com.google.daq.mqtt.registrar.Registrar.NORMALIZED_JSON;
 import static com.google.daq.mqtt.util.Common.VERSION_PROPERTY_KEY;
 import static com.google.daq.mqtt.util.MessageUpgrader.METADATA_SCHEMA;
+import static com.google.udmi.util.JsonUtil.asMap;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -25,7 +28,6 @@
 import com.github.fge.jsonschema.core.report.ProcessingReport;
 import com.github.fge.jsonschema.main.JsonSchema;
 import com.google.api.services.cloudiot.v1.model.DeviceCredential;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
@@ -36,6 +38,8 @@
 import com.google.daq.mqtt.util.ExceptionMap.ErrorTree;
 import com.google.daq.mqtt.util.MessageUpgrader;
 import com.google.daq.mqtt.util.ValidationException;
+import com.google.udmi.util.GeneralUtils;
+import com.google.udmi.util.JsonUtil;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -58,7 +62,6 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.SortedSet;
-import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.regex.Pattern;
 import org.apache.commons.io.IOUtils;
@@ -192,7 +195,7 @@ class LocalDevice {
   private final ExceptionMap exceptionMap;
   private final String generation;
   private final List<DeviceCredential> deviceCredentials = new ArrayList<>();
-  private final TreeMap<String, Object> siteMetadata;
+  private final Map<String, Object> siteMetadata;
   private final boolean validateMetadata;
 
   private String deviceNumId;
@@ -210,7 +213,7 @@ class LocalDevice {
       this.siteDir = siteDir;
       this.validateMetadata = validateMetadata;
       if (siteMetadata != null) {
-        this.siteMetadata = OBJECT_MAPPER.convertValue(siteMetadata, TreeMap.class);
+        this.siteMetadata = JsonUtil.asMap(siteMetadata);
       } else {
         this.siteMetadata = null;
       }
@@ -266,7 +269,7 @@ public void validateExpected() {
     ExceptionMap exceptionMap = new ExceptionMap(relativized.toString());
 
     String[] files = deviceDir.list();
-    Preconditions.checkNotNull(files, "No files found in " + deviceDir.getAbsolutePath());
+    checkNotNull(files, "No files found in " + deviceDir.getAbsolutePath());
     Set<String> actualFiles = ImmutableSet.copyOf(files);
     Set<String> expectedFiles = Sets.union(DEVICE_FILES, keyFiles());
     SortedSet<String> missing = new TreeSet<>(Sets.difference(expectedFiles, actualFiles));
@@ -290,22 +293,6 @@ public void validateExpected() {
     exceptionMap.throwIfNotEmpty();
   }
 
-  private void deepMergeDefaults(Map<String, Object> destination, Map<String, Object> source) {
-    for (String key : source.keySet()) {
-      Object value2 = source.get(key);
-      if (destination.containsKey(key)) {
-        Object value1 = destination.get(key);
-        // When destination and source both contain key, deep copy maps but not other key/values,
-        // which would produce config override rather than defaults.
-        if (value1 instanceof Map && value2 instanceof Map) {
-          deepMergeDefaults((Map<String, Object>) value1, (Map<String, Object>) value2);
-        }
-      } else {
-        destination.put(key, value2);
-      }
-    }
-  }
-
   private Metadata readMetadataWithValidation(boolean validate) {
     File metadataFile = new File(deviceDir, METADATA_JSON);
     final JsonNode instance;
@@ -328,14 +315,13 @@ private Metadata readMetadataWithValidation(boolean validate) {
     }
 
     try {
-      String intermediary = OBJECT_MAPPER.writeValueAsString(instance);
+      String intermediary = JsonUtil.stringify(instance);
       if (siteMetadata == null) {
-        return OBJECT_MAPPER.readValue(intermediary, Metadata.class);
+        return JsonUtil.convertTo(Metadata.class, intermediary);
       } else {
-        final Map<String, Object> metadataBase = OBJECT_MAPPER.readValue(intermediary,
-            TreeMap.class);
-        deepMergeDefaults(metadataBase, siteMetadata);
-        return OBJECT_MAPPER.convertValue(metadataBase, Metadata.class);
+        Map<String, Object> mergedMetadata = GeneralUtils.deepCopy(siteMetadata);
+        GeneralUtils.mergeObject(mergedMetadata, asMap(intermediary));
+        return JsonUtil.convertTo(Metadata.class, mergedMetadata);
       }
     } catch (Exception e) {
       exceptionMap.put(EXCEPTION_READING, e);
@@ -494,7 +480,7 @@ boolean isDirectConnect() {
   }
 
   CloudDeviceSettings getSettings() {
-    return Preconditions.checkNotNull(settings, "Device settings not initialized");
+    return checkNotNull(settings, "Device settings not initialized");
   }
 
   void initializeSettings() {
@@ -679,14 +665,12 @@ private void checkConsistency(String expectedSite) {
     }
     if (metadata.system.physical_tag != null) {
       String assetName = metadata.system.physical_tag.asset.name;
-      Preconditions.checkState(
-          deviceId.equals(assetName),
-          String.format(
-              "system.physical_tag.asset.name %s does not match expected %s", assetName, deviceId));
+      checkState(deviceId.equals(assetName),
+          String.format("system.physical_tag.asset.name %s does not match expected %s", assetName,
+              deviceId));
 
       String assetSite = metadata.system.physical_tag.asset.site;
-      Preconditions.checkState(
-          expectedSite.equals(assetSite),
+      checkState(expectedSite.equals(assetSite),
           String.format(
               "system.physical_tag.asset.site %s does not match expected %s",
               assetSite, expectedSite));
@@ -694,8 +678,7 @@ private void checkConsistency(String expectedSite) {
 
     if (metadata.system.location != null) {
       String siteName = metadata.system.location.site;
-      Preconditions.checkState(
-          expectedSite.equals(siteName),
+      checkState(expectedSite.equals(siteName),
           String.format(
               "system.location.site %s does not match expected %s", siteName, expectedSite));
     }
@@ -781,7 +764,7 @@ public String getDeviceId() {
   }
 
   public String getDeviceNumId() {
-    return Preconditions.checkNotNull(deviceNumId, "deviceNumId not set");
+    return checkNotNull(deviceNumId, "deviceNumId not set");
   }
 
   public void setDeviceNumId(String numId) {
diff --git a/validator/src/main/java/com/google/daq/mqtt/registrar/Registrar.java b/validator/src/main/java/com/google/daq/mqtt/registrar/Registrar.java
index 3cc2a783c9..f3212f4715 100644
--- a/validator/src/main/java/com/google/daq/mqtt/registrar/Registrar.java
+++ b/validator/src/main/java/com/google/daq/mqtt/registrar/Registrar.java
@@ -1,7 +1,7 @@
 package com.google.daq.mqtt.registrar;
 
 import static com.google.daq.mqtt.util.Common.NO_SITE;
-import static com.google.daq.mqtt.util.JsonUtil.OBJECT_MAPPER;
+import static com.google.udmi.util.JsonUtil.OBJECT_MAPPER;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.github.fge.jsonschema.core.load.configuration.LoadingConfiguration;
@@ -31,7 +31,6 @@
 import java.net.URI;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Date;
@@ -74,6 +73,7 @@ public class Registrar {
   private static final int RUNNER_THREADS = 25;
   private static final String CONFIG_SUB_TYPE = "config";
   private static final String MODEL_SUB_TYPE = "model";
+  private static final boolean DEFAULT_BLOCK_UNKNOWN = true;
   private final Map<String, JsonSchema> schemas = new HashMap<>();
   private final String generation = getGenerationString();
   private CloudIotManager cloudIotManager;
@@ -208,7 +208,7 @@ private void writeErrors() throws Exception {
             device -> {
               Set<Entry<String, ErrorTree>> entries =
                   device.getTreeChildren(dem.forDevice(device.getDeviceId()));
-              entries.stream()
+              entries
                   .forEach(
                       error ->
                           errorSummary
@@ -245,17 +245,17 @@ protected void setSitePath(String sitePath) {
 
   private void initializeCloudProject() {
     cloudIotManager = new CloudIotManager(projectId, siteDir);
-    System.err.println(
-        String.format(
-            "Working with project %s registry %s/%s",
-            cloudIotManager.getProjectId(),
-            cloudIotManager.getCloudRegion(),
-            cloudIotManager.getRegistryId()));
+    System.err.printf(
+        "Working with project %s registry %s/%s%n",
+        cloudIotManager.getProjectId(),
+        cloudIotManager.getCloudRegion(),
+        cloudIotManager.getRegistryId());
 
     if (cloudIotManager.getUpdateTopic() != null) {
       updatePusher = new PubSubPusher(projectId, cloudIotManager.getUpdateTopic());
     }
-    blockUnknown = cloudIotManager.cloudIotConfig.block_unknown;
+    blockUnknown = Objects.requireNonNullElse(cloudIotManager.executionConfiguration.block_unknown,
+        DEFAULT_BLOCK_UNKNOWN);
   }
 
   private String getGenerationString() {
@@ -377,8 +377,8 @@ private boolean sendFeedMessage(LocalDevice localDevice) {
       Map<String, String> attributes = new HashMap<>();
       attributes.put("subFolder", SWARM_SUBFOLDER);
       attributes.put("deviceId", localDevice.getDeviceId());
-      attributes.put("deviceRegistryId", cloudIotManager.cloudIotConfig.registry_id);
-      attributes.put("deviceRegistryLocation", cloudIotManager.cloudIotConfig.cloud_region);
+      attributes.put("deviceRegistryId", cloudIotManager.executionConfiguration.registry_id);
+      attributes.put("deviceRegistryLocation", cloudIotManager.executionConfiguration.cloud_region);
       SwarmMessage swarmMessage = new SwarmMessage();
       swarmMessage.key_base64 = Base64.getEncoder().encodeToString(localDevice.getKeyBytes());
       swarmMessage.device_metadata = localDevice.getMetadata();
diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java
index f57ac575cd..261867d0ff 100644
--- a/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java
+++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java
@@ -2,9 +2,9 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.daq.mqtt.sequencer.semantic.SemanticValue.actualize;
-import static com.google.daq.mqtt.util.JsonUtil.getTimestamp;
-import static com.google.daq.mqtt.util.JsonUtil.safeSleep;
-import static com.google.daq.mqtt.util.JsonUtil.stringify;
+import static com.google.udmi.util.JsonUtil.getTimestamp;
+import static com.google.udmi.util.JsonUtil.safeSleep;
+import static com.google.udmi.util.JsonUtil.stringify;
 import static java.util.Optional.ofNullable;
 
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -15,15 +15,13 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.daq.mqtt.sequencer.semantic.SemanticDate;
 import com.google.daq.mqtt.sequencer.semantic.SemanticValue;
-import com.google.daq.mqtt.util.CloudIotConfig;
 import com.google.daq.mqtt.util.Common;
 import com.google.daq.mqtt.util.ConfigDiffEngine;
 import com.google.daq.mqtt.util.ConfigUtil;
-import com.google.daq.mqtt.util.JsonUtil;
-import com.google.daq.mqtt.util.ValidatorConfig;
 import com.google.daq.mqtt.validator.AugmentedState;
 import com.google.daq.mqtt.validator.AugmentedSystemConfig;
-import com.google.daq.mqtt.validator.CleanDateFormat;
+import com.google.udmi.util.CleanDateFormat;
+import com.google.udmi.util.JsonUtil;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.PrintWriter;
@@ -54,6 +52,7 @@
 import udmi.schema.Entry;
 import udmi.schema.Envelope.SubFolder;
 import udmi.schema.Envelope.SubType;
+import udmi.schema.ExecutionConfiguration;
 import udmi.schema.Level;
 import udmi.schema.Metadata;
 import udmi.schema.PointsetEvent;
@@ -113,7 +112,7 @@ public abstract class SequenceBase {
   protected static String deviceId;
   protected static String cloudRegion;
   protected static String registryId;
-  static ValidatorConfig validatorConfig;
+  static ExecutionConfiguration validatorConfig;
   private static String udmiVersion;
   private static String siteModel;
   private static String serialNo;
@@ -243,8 +242,8 @@ private void recordCompletion(String result, Level level,
   };
 
   private static void ensureValidatorConfig() {
-    if (SequenceRunner.validationConfig != null) {
-      validatorConfig = SequenceRunner.validationConfig;
+    if (SequenceRunner.executionConfiguration != null) {
+      validatorConfig = SequenceRunner.executionConfiguration;
     } else {
       if (CONFIG_PATH == null || CONFIG_PATH.equals("")) {
         throw new RuntimeException(CONFIG_ENV + " env not defined.");
@@ -277,15 +276,15 @@ private static void setupSequencer() {
     }
 
     File cloudIotConfigFile = new File(new File(siteModel), CLOUD_IOT_CONFIG_FILE);
-    final CloudIotConfig cloudIotConfig;
+    final ExecutionConfiguration executionConfiguration;
     try {
-      cloudIotConfig = ConfigUtil.readCloudIotConfig(cloudIotConfigFile);
+      executionConfiguration = ConfigUtil.readExecutionConfiguration(cloudIotConfigFile);
     } catch (Exception e) {
       throw new RuntimeException("While loading " + cloudIotConfigFile.getAbsolutePath(), e);
     }
 
-    cloudRegion = cloudIotConfig.cloud_region;
-    registryId = cloudIotConfig.registry_id;
+    cloudRegion = executionConfiguration.cloud_region;
+    registryId = executionConfiguration.registry_id;
 
     deviceMetadata = readDeviceMetadata();
 
@@ -298,7 +297,7 @@ private static void setupSequencer() {
 
     System.err.printf("Loading reflector key file from %s%n", new File(key_file).getAbsolutePath());
     System.err.printf("Validating against device %s serial %s%n", deviceId, serialNo);
-    client = new IotReflectorClient(projectId, cloudIotConfig, key_file);
+    client = new IotReflectorClient(projectId, executionConfiguration, key_file);
     setReflectorState();
   }
 
diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceRunner.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceRunner.java
index 3194b1de10..e9e08d57f8 100644
--- a/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceRunner.java
+++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceRunner.java
@@ -4,7 +4,6 @@
 import com.google.daq.mqtt.WebServerRunner;
 import com.google.daq.mqtt.sequencer.sequences.ConfigSequences;
 import com.google.daq.mqtt.util.Common;
-import com.google.daq.mqtt.util.ValidatorConfig;
 import com.google.udmi.util.SiteModel;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -17,6 +16,7 @@
 import org.junit.runner.Request;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
+import udmi.schema.ExecutionConfiguration;
 import udmi.schema.Level;
 
 /**
@@ -27,7 +27,7 @@ public class SequenceRunner {
   private static final String INITIALIZATION_ERROR_PREFIX = "initializationError(org.junit.";
   private static final int EXIT_STATUS_SUCCESS = 0;
   private static final int EXIST_STATUS_FAILURE = 1;
-  static ValidatorConfig validationConfig;
+  static ExecutionConfiguration executionConfiguration;
   private final Set<String> sequenceClasses = Common.allClassesInPackage(ConfigSequences.class);
   private int successes = -1;
   private List<Failure> failures;
@@ -58,8 +58,8 @@ private static boolean hasActualTestResults(Result result) {
         || !result.getFailures().get(0).toString().startsWith(INITIALIZATION_ERROR_PREFIX));
   }
 
-  static SequenceRunner processConfig(ValidatorConfig config) {
-    validationConfig = config;
+  static SequenceRunner processConfig(ExecutionConfiguration config) {
+    executionConfiguration = config;
     SequenceRunner sequenceRunner = new SequenceRunner();
     sequenceRunner.process(List.of());
     return sequenceRunner;
@@ -77,7 +77,7 @@ public static void handleRequest(Map<String, String> params) {
     siteModel.initialize();
     String deviceId = params.remove(WebServerRunner.DEVICE_PARAM);
 
-    ValidatorConfig config = new ValidatorConfig();
+    ExecutionConfiguration config = new ExecutionConfiguration();
     config.project_id = projectId;
     config.site_model = sitePath;
     config.device_id = deviceId;
diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java
index e946f26f7c..d422d37893 100644
--- a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java
+++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ConfigSequences.java
@@ -1,7 +1,7 @@
 package com.google.daq.mqtt.sequencer.sequences;
 
-import static com.google.daq.mqtt.util.JsonUtil.getTimestamp;
-import static com.google.daq.mqtt.validator.CleanDateFormat.dateEquals;
+import static com.google.udmi.util.CleanDateFormat.dateEquals;
+import static com.google.udmi.util.JsonUtil.getTimestamp;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static udmi.schema.Category.SYSTEM_CONFIG_APPLY;
diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/DiscoverySequences.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/DiscoverySequences.java
index c18577cbf7..3b9f0907ed 100644
--- a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/DiscoverySequences.java
+++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/DiscoverySequences.java
@@ -8,8 +8,8 @@
 import com.google.daq.mqtt.sequencer.SequenceBase;
 import com.google.daq.mqtt.sequencer.SkipTest;
 import com.google.daq.mqtt.sequencer.semantic.SemanticDate;
-import com.google.daq.mqtt.util.JsonUtil;
-import com.google.daq.mqtt.validator.CleanDateFormat;
+import com.google.udmi.util.CleanDateFormat;
+import com.google.udmi.util.JsonUtil;
 import java.time.Instant;
 import java.util.Date;
 import java.util.HashMap;
diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/WritebackSequences.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/WritebackSequences.java
index 63e578c0fd..a35fb157b2 100644
--- a/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/WritebackSequences.java
+++ b/validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/WritebackSequences.java
@@ -1,7 +1,7 @@
 package com.google.daq.mqtt.sequencer.sequences;
 
 import com.google.daq.mqtt.sequencer.PointSequencer;
-import com.google.daq.mqtt.util.JsonUtil;
+import com.google.udmi.util.JsonUtil;
 import java.util.Objects;
 import org.junit.Test;
 import udmi.schema.PointPointsetState.Value_state;
diff --git a/validator/src/main/java/com/google/daq/mqtt/util/CloudIotConfig.java b/validator/src/main/java/com/google/daq/mqtt/util/CloudIotConfig.java
deleted file mode 100644
index d5a348b6fe..0000000000
--- a/validator/src/main/java/com/google/daq/mqtt/util/CloudIotConfig.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.google.daq.mqtt.util;
-
-/**
- * Data class encapsulating cloud-based configuration.
- */
-@SuppressWarnings("MemberName")
-public class CloudIotConfig {
-
-  public String registry_id;
-  public String cloud_region;
-  public String reflect_region;
-  public String site_name;
-  public String update_topic;
-  public String alt_project;
-  public String alt_registry;
-  public boolean block_unknown = true;
-}
diff --git a/validator/src/main/java/com/google/daq/mqtt/util/CloudIotManager.java b/validator/src/main/java/com/google/daq/mqtt/util/CloudIotManager.java
index 92405895e1..66d440dff3 100644
--- a/validator/src/main/java/com/google/daq/mqtt/util/CloudIotManager.java
+++ b/validator/src/main/java/com/google/daq/mqtt/util/CloudIotManager.java
@@ -1,6 +1,6 @@
 package com.google.daq.mqtt.util;
 
-import static com.google.daq.mqtt.util.ConfigUtil.readCloudIotConfig;
+import static com.google.daq.mqtt.util.ConfigUtil.readExecutionConfiguration;
 
 import com.google.api.services.cloudiot.v1.model.Device;
 import com.google.api.services.cloudiot.v1.model.DeviceCredential;
@@ -10,13 +10,13 @@
 import com.google.common.collect.ImmutableList;
 import java.io.File;
 import java.io.IOException;
-import java.util.AbstractMap.SimpleEntry;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import udmi.schema.ExecutionConfiguration;
 
 /**
  * Encapsulation of all Cloud IoT interaction functions.
@@ -32,7 +32,7 @@ public class CloudIotManager {
   private static final String KEY_ALGORITHM_KEY = "key_algorithm";
   private static final String MOCK_PROJECT = "unit-testing";
 
-  public final CloudIotConfig cloudIotConfig;
+  public final ExecutionConfiguration executionConfiguration;
 
   private final String registryId;
   private final String projectId;
@@ -52,9 +52,9 @@ public CloudIotManager(String projectId, File siteDir) {
     File cloudConfig = new File(siteDir, CLOUD_IOT_CONFIG_JSON);
     try {
       System.err.println("Reading cloud config from " + cloudConfig.getAbsolutePath());
-      cloudIotConfig = validate(readCloudIotConfig(cloudConfig), projectId);
-      registryId = cloudIotConfig.registry_id;
-      cloudRegion = cloudIotConfig.cloud_region;
+      executionConfiguration = validate(readExecutionConfiguration(cloudConfig), projectId);
+      registryId = executionConfiguration.registry_id;
+      cloudRegion = executionConfiguration.cloud_region;
       initializeIotProvider();
     } catch (Exception e) {
       throw new RuntimeException(
@@ -66,22 +66,24 @@ public CloudIotManager(String projectId, File siteDir) {
   /**
    * Validate the given configuration.
    *
-   * @param cloudIotConfig configuration to validate
-   * @param projectId      expected project id
+   * @param executionConfiguration configuration to validate
+   * @param projectId              expected project id
    * @return validated config (for chaining)
    */
-  public static CloudIotConfig validate(CloudIotConfig cloudIotConfig, String projectId) {
-    if (projectId.equals(cloudIotConfig.alt_project)) {
-      System.err.printf("Using alt_registry %s for alt_project %s\n", cloudIotConfig.alt_registry,
-          cloudIotConfig.alt_project);
-      cloudIotConfig.alt_project = null;
-      cloudIotConfig.registry_id = cloudIotConfig.alt_registry;
-      cloudIotConfig.alt_registry = null;
+  public static ExecutionConfiguration validate(ExecutionConfiguration executionConfiguration,
+      String projectId) {
+    if (projectId.equals(executionConfiguration.alt_project)) {
+      System.err.printf("Using alt_registry %s for alt_project %s\n",
+          executionConfiguration.alt_registry,
+          executionConfiguration.alt_project);
+      executionConfiguration.alt_project = null;
+      executionConfiguration.registry_id = executionConfiguration.alt_registry;
+      executionConfiguration.alt_registry = null;
     }
-    Preconditions.checkNotNull(cloudIotConfig.registry_id, "registry_id not defined");
-    Preconditions.checkNotNull(cloudIotConfig.cloud_region, "cloud_region not defined");
-    Preconditions.checkNotNull(cloudIotConfig.site_name, "site_name not defined");
-    return cloudIotConfig;
+    Preconditions.checkNotNull(executionConfiguration.registry_id, "registry_id not defined");
+    Preconditions.checkNotNull(executionConfiguration.cloud_region, "cloud_region not defined");
+    Preconditions.checkNotNull(executionConfiguration.site_name, "site_name not defined");
+    return executionConfiguration;
   }
 
   /**
@@ -233,7 +235,7 @@ public String getProjectId() {
    * @return Name for the site (building name)
    */
   public String getSiteName() {
-    return cloudIotConfig.site_name;
+    return executionConfiguration.site_name;
   }
 
   /**
@@ -242,7 +244,7 @@ public String getSiteName() {
    * @return Topic name to use for sending update messages
    */
   public String getUpdateTopic() {
-    return cloudIotConfig.update_topic;
+    return executionConfiguration.update_topic;
   }
 
   /**
diff --git a/validator/src/main/java/com/google/daq/mqtt/util/ConfigUtil.java b/validator/src/main/java/com/google/daq/mqtt/util/ConfigUtil.java
index 9705275ef8..5188b4ed13 100644
--- a/validator/src/main/java/com/google/daq/mqtt/util/ConfigUtil.java
+++ b/validator/src/main/java/com/google/daq/mqtt/util/ConfigUtil.java
@@ -8,10 +8,10 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.regex.Pattern;
+import udmi.schema.ExecutionConfiguration;
 
 /**
  * Collection of utilities for managing configuration.
@@ -31,9 +31,9 @@ public abstract class ConfigUtil {
    * @param configFile file ot parse
    * @return cloud configuration information
    */
-  public static CloudIotConfig readCloudIotConfig(File configFile) {
+  public static ExecutionConfiguration readExecutionConfiguration(File configFile) {
     try {
-      return OBJECT_MAPPER.readValue(configFile, CloudIotConfig.class);
+      return OBJECT_MAPPER.readValue(configFile, ExecutionConfiguration.class);
     } catch (Exception e) {
       throw new RuntimeException("While reading config file " + configFile.getAbsolutePath(), e);
     }
@@ -72,9 +72,9 @@ static AllDeviceExceptions loadExceptions(File siteConfig) {
    * @param configFile file to read
    * @return parsed validator config
    */
-  public static ValidatorConfig readValidatorConfig(File configFile) {
+  public static ExecutionConfiguration readValidatorConfig(File configFile) {
     try {
-      return OBJECT_MAPPER.readValue(configFile, ValidatorConfig.class);
+      return OBJECT_MAPPER.readValue(configFile, ExecutionConfiguration.class);
     } catch (Exception e) {
       throw new RuntimeException("While reading config file " + configFile.getAbsolutePath(), e);
     }
diff --git a/validator/src/main/java/com/google/daq/mqtt/util/MessageUpgrader.java b/validator/src/main/java/com/google/daq/mqtt/util/MessageUpgrader.java
index add36b17f1..f43646aa81 100644
--- a/validator/src/main/java/com/google/daq/mqtt/util/MessageUpgrader.java
+++ b/validator/src/main/java/com/google/daq/mqtt/util/MessageUpgrader.java
@@ -35,7 +35,6 @@ public MessageUpgrader(String schemaName, JsonNode message) {
     String verStr =
         version != null ? version.isNumber() ? Integer.toString(version.asInt()) : version.asText()
             : "1";
-
     String[] components = verStr.split("-", 2);
     String[] parts = components[0].split("\\.", 4);
     major = Integer.parseInt(parts[0]);
diff --git a/validator/src/main/java/com/google/daq/mqtt/util/PubSubClient.java b/validator/src/main/java/com/google/daq/mqtt/util/PubSubClient.java
index dba877821f..82931a9e29 100644
--- a/validator/src/main/java/com/google/daq/mqtt/util/PubSubClient.java
+++ b/validator/src/main/java/com/google/daq/mqtt/util/PubSubClient.java
@@ -21,6 +21,7 @@
 import com.google.pubsub.v1.ProjectTopicName;
 import com.google.pubsub.v1.PubsubMessage;
 import com.google.pubsub.v1.SeekRequest;
+import com.google.udmi.util.JsonUtil;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/validator/src/main/java/com/google/daq/mqtt/util/ValidatorConfig.java b/validator/src/main/java/com/google/daq/mqtt/util/ValidatorConfig.java
deleted file mode 100644
index 499c3214bf..0000000000
--- a/validator/src/main/java/com/google/daq/mqtt/util/ValidatorConfig.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.google.daq.mqtt.util;
-
-/**
- * Configuration of a validator instance.
- */
-@SuppressWarnings("MemberName")
-public class ValidatorConfig {
-  public String site_model;
-  public String device_id;
-  public String project_id;
-  public String key_file;
-  public String serial_no;
-  public String log_level;
-  public String udmi_version;
-}
diff --git a/validator/src/main/java/com/google/daq/mqtt/validator/Reflector.java b/validator/src/main/java/com/google/daq/mqtt/validator/Reflector.java
index ef88026b9d..532428045e 100644
--- a/validator/src/main/java/com/google/daq/mqtt/validator/Reflector.java
+++ b/validator/src/main/java/com/google/daq/mqtt/validator/Reflector.java
@@ -5,7 +5,6 @@
 import static com.google.daq.mqtt.util.Common.removeNextArg;
 
 import com.google.bos.iot.core.proxy.IotReflectorClient;
-import com.google.daq.mqtt.util.CloudIotConfig;
 import com.google.daq.mqtt.util.CloudIotManager;
 import com.google.daq.mqtt.util.ConfigUtil;
 import java.io.File;
@@ -13,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import udmi.schema.ExecutionConfiguration;
 
 /**
  * General utility for working with UDMI Reflector messages.
@@ -22,7 +22,7 @@ public class Reflector {
   private final List<String> reflectCommands;
   private String projectId;
   private String siteDir;
-  private CloudIotConfig cloudIotConfig;
+  private ExecutionConfiguration executionConfiguration;
   private File baseDir;
   private IotReflectorClient client;
   private String deviceId;
@@ -91,7 +91,7 @@ private void reflect(String topic, String data) {
   private void initialize() {
     String keyFile = new File(siteDir, GCP_REFLECT_KEY_PKCS8).getAbsolutePath();
     System.err.println("Loading reflector key file from " + keyFile);
-    client = new IotReflectorClient(projectId, cloudIotConfig, keyFile);
+    client = new IotReflectorClient(projectId, executionConfiguration, keyFile);
   }
 
   private List<String> parseArgs(List<String> argsList) {
@@ -133,7 +133,8 @@ public void setSiteDir(String siteDir) {
       this.siteDir = siteDir;
       baseDir = new File(siteDir);
       File cloudConfig = new File(siteDir, "cloud_iot_config.json");
-      cloudIotConfig = CloudIotManager.validate(ConfigUtil.readCloudIotConfig(cloudConfig),
+      executionConfiguration = CloudIotManager.validate(
+          ConfigUtil.readExecutionConfiguration(cloudConfig),
           projectId);
     }
   }
diff --git a/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java b/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java
index 3e64af1017..40ab39482c 100644
--- a/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java
+++ b/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java
@@ -1,13 +1,16 @@
 package com.google.daq.mqtt.validator;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.daq.mqtt.util.Common.GCP_REFLECT_KEY_PKCS8;
 import static com.google.daq.mqtt.util.Common.NO_SITE;
 import static com.google.daq.mqtt.util.Common.STATE_QUERY_TOPIC;
 import static com.google.daq.mqtt.util.Common.TIMESTAMP_PROPERTY_KEY;
 import static com.google.daq.mqtt.util.Common.removeNextArg;
 import static com.google.daq.mqtt.util.ConfigUtil.UDMI_VERSION;
-import static com.google.daq.mqtt.util.JsonUtil.JSON_SUFFIX;
-import static com.google.daq.mqtt.util.JsonUtil.OBJECT_MAPPER;
+import static com.google.daq.mqtt.util.ConfigUtil.readExecutionConfiguration;
+import static com.google.udmi.util.JsonUtil.JSON_SUFFIX;
+import static com.google.udmi.util.JsonUtil.OBJECT_MAPPER;
+import static java.util.Objects.requireNonNull;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -19,21 +22,22 @@
 import com.github.fge.jsonschema.main.JsonSchemaFactory;
 import com.google.bos.iot.core.proxy.IotReflectorClient;
 import com.google.bos.iot.core.proxy.NullPublisher;
+import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.daq.mqtt.util.CloudIotConfig;
 import com.google.daq.mqtt.util.CloudIotManager;
 import com.google.daq.mqtt.util.ConfigUtil;
 import com.google.daq.mqtt.util.ExceptionMap;
 import com.google.daq.mqtt.util.ExceptionMap.ErrorTree;
 import com.google.daq.mqtt.util.FileDataSink;
-import com.google.daq.mqtt.util.JsonUtil;
 import com.google.daq.mqtt.util.MessagePublisher;
 import com.google.daq.mqtt.util.MessageUpgrader;
 import com.google.daq.mqtt.util.PubSubClient;
 import com.google.daq.mqtt.util.ValidationException;
+import com.google.udmi.util.GeneralUtils;
+import com.google.udmi.util.JsonUtil;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -53,7 +57,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.MissingFormatArgumentException;
-import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -67,6 +70,7 @@
 import udmi.schema.Entry;
 import udmi.schema.Envelope.SubFolder;
 import udmi.schema.Envelope.SubType;
+import udmi.schema.ExecutionConfiguration;
 import udmi.schema.Metadata;
 import udmi.schema.PointsetEvent;
 import udmi.schema.PointsetState;
@@ -121,13 +125,11 @@ public class Validator {
   private final Map<String, AtomicInteger> deviceMessageIndex = new HashMap<>();
   private final List<MessagePublisher> dataSinks = new ArrayList<>();
   private final List<String> deviceIds;
-  private String projectId;
   private File outBaseDir;
   private File schemaRoot;
   private String schemaSpec;
-  private CloudIotConfig cloudIotConfig;
+  private ExecutionConfiguration config;
   private CloudIotManager cloudIotManager;
-  private String siteDir;
   private MessagePublisher client;
   private Map<String, JsonSchema> schemaMap;
   private File traceDir;
@@ -171,13 +173,18 @@ public static void main(String[] args) {
     System.exit(0);
   }
 
-  private void parseArgs(List<String> argList) {
+  private List<String> parseArgs(List<String> argList) {
+    if (!argList.isEmpty() && !argList.get(0).startsWith("-")) {
+      processProfile(new File(argList.remove(0)));
+    } else {
+      config = new ExecutionConfiguration();
+    }
     while (!argList.isEmpty()) {
       String option = removeNextArg(argList);
       try {
         switch (option) {
           case "-p":
-            projectId = removeNextArg(argList);
+            config.project_id = removeNextArg(argList);
             break;
           case "-s":
             setSiteDir(removeNextArg(argList));
@@ -186,7 +193,7 @@ private void parseArgs(List<String> argList) {
             setSchemaSpec(removeNextArg(argList));
             break;
           case "-t":
-            cloudIotManager = new CloudIotManager(projectId, new File(siteDir));
+            cloudIotManager = new CloudIotManager(config.project_id, new File(config.site_model));
             validatePubSub(removeNextArg(argList));
             break;
           case "-f":
@@ -203,7 +210,7 @@ private void parseArgs(List<String> argList) {
             break;
           case "--":
             // All remaining arguments remain in the return list.
-            return;
+            return argList;
           default:
             throw new RuntimeException("Unknown cmdline option " + option);
         }
@@ -211,6 +218,12 @@ private void parseArgs(List<String> argList) {
         throw new RuntimeException("For command line option " + option, e);
       }
     }
+    return argList;
+  }
+
+  private void processProfile(File profilePath) {
+    config = ConfigUtil.readExecutionConfiguration(profilePath);
+    setSiteDir(config.site_model);
   }
 
   MessageReadingClient getMessageReadingClient() {
@@ -218,7 +231,7 @@ MessageReadingClient getMessageReadingClient() {
   }
 
   private void validateMessageTrace(String messageDir) {
-    client = new MessageReadingClient(cloudIotConfig.registry_id, messageDir);
+    client = new MessageReadingClient(config.registry_id, messageDir);
     dataSinks.add(client);
     prepForMock();
   }
@@ -234,16 +247,13 @@ Validator prepForMock() {
    * @param siteDir site model directory
    */
   public void setSiteDir(String siteDir) {
+    config.site_model = siteDir;
     final File baseDir;
     if (NO_SITE.equals(siteDir)) {
-      this.siteDir = null;
       baseDir = new File(".");
     } else {
-      this.siteDir = siteDir;
       baseDir = new File(siteDir);
-      File cloudConfig = new File(siteDir, "cloud_iot_config.json");
-      cloudIotConfig = CloudIotManager.validate(ConfigUtil.readCloudIotConfig(cloudConfig),
-          projectId);
+      config = CloudIotManager.validate(resolveSiteConfig(config, siteDir), config.project_id);
       initializeExpectedDevices(siteDir);
     }
 
@@ -252,6 +262,16 @@ public void setSiteDir(String siteDir) {
     dataSinks.add(new FileDataSink(outBaseDir));
   }
 
+  private ExecutionConfiguration resolveSiteConfig(ExecutionConfiguration config, String siteDir) {
+    File cloudConfig = new File(siteDir, "cloud_iot_config.json");
+    if (config == null) {
+      return readExecutionConfiguration(cloudConfig);
+    }
+    checkArgument(siteDir.equals(config.site_model), "siteDir mismatch");
+    ExecutionConfiguration siteConfig = readExecutionConfiguration(cloudConfig);
+    return GeneralUtils.mergeObject(siteConfig, config);
+  }
+
   private void setMessageTraceDir(String writeDirArg) {
     traceDir = new File(writeDirArg);
     if (traceDir.exists()) {
@@ -268,7 +288,7 @@ private void initializeExpectedDevices(String siteDir) {
       return;
     }
     try {
-      for (String device : Objects.requireNonNull(devicesDir.list())) {
+      for (String device : requireNonNull(devicesDir.list())) {
         ReportingDevice reportingDevice = new ReportingDevice(device);
         try {
           File deviceDir = new File(devicesDir, device);
@@ -324,21 +344,20 @@ private Map<String, JsonSchema> getSchemaMap() {
   private void validatePubSub(String instName) {
     String registryId = getRegistryId();
     String updateTopic = cloudIotManager.getUpdateTopic();
-    client = new PubSubClient(projectId, registryId, instName, updateTopic);
+    client = new PubSubClient(config.project_id, registryId, instName, updateTopic);
     if (updateTopic != null) {
       dataSinks.add(client);
     }
   }
 
   private String getRegistryId() {
-    String registryId = cloudIotConfig.registry_id;
-    return registryId;
+    return config.registry_id;
   }
 
   private void validateReflector() {
-    String keyFile = new File(siteDir, GCP_REFLECT_KEY_PKCS8).getAbsolutePath();
+    String keyFile = new File(config.site_model, GCP_REFLECT_KEY_PKCS8).getAbsolutePath();
     System.err.println("Loading reflector key file from " + keyFile);
-    client = new IotReflectorClient(projectId, cloudIotConfig, keyFile);
+    client = new IotReflectorClient(config.project_id, config, keyFile);
   }
 
   void messageLoop() {
@@ -454,7 +473,7 @@ private ReportingDevice validateUpdate(
               String.format(SCHEMA_SKIP_FORMAT, schemaName, deviceId));
         }
       } catch (Exception e) {
-        System.err.println(e.getMessage());
+        System.err.println("Missing schema entry " + schemaName);
         device.addError(e);
       }
 
@@ -465,11 +484,13 @@ private ReportingDevice validateUpdate(
         device.addError(e);
       }
 
+      System.err.println(
+          "Validating against " + schemaName + " " + schemaMap.containsKey(schemaName));
       if (schemaMap.containsKey(schemaName)) {
         try {
           validateMessage(schemaMap.get(schemaName), message);
         } catch (Exception e) {
-          System.err.println("Error validating schema: " + e.getMessage());
+          System.err.printf("Error validating schema %s: %s%n", schemaName, e.getMessage());
           device.addError(e);
         }
       }
@@ -496,6 +517,7 @@ private ReportingDevice validateUpdate(
         System.err.printf("Validation complete %s/%s%n", deviceId, schemaName);
       }
     } catch (Exception e) {
+      System.err.println("Generic device error " + deviceId);
       device.addError(e);
     }
     return device;
@@ -565,7 +587,7 @@ private void writeMessageCapture(Map<String, Object> message, Map<String, String
   private boolean shouldConsiderMessage(Map<String, String> attributes) {
     String registryId = attributes.get(DEVICE_REGISTRY_ID_KEY);
 
-    if (cloudIotConfig != null && !cloudIotConfig.registry_id.equals(registryId)) {
+    if (config != null && !config.registry_id.equals(registryId)) {
       if (ignoredRegistries.add(registryId)) {
         System.err.println("Ignoring data for not-configured registry " + registryId);
       }
@@ -783,7 +805,7 @@ private void validateFile(
       writeExceptionOutput(targetOut, null);
     } catch (Exception e) {
       writeExceptionOutput(targetOut, e);
-      throw new RuntimeException("Against input " + targetFile, e);
+      throw new RuntimeException("Generating output " + targetOut.getAbsolutePath(), e);
     }
   }
 
diff --git a/validator/src/test/java/com/google/daq/mqtt/sequencer/SequenceRunnerTest.java b/validator/src/test/java/com/google/daq/mqtt/sequencer/SequenceRunnerTest.java
index 741122aec1..86e7d1dc79 100644
--- a/validator/src/test/java/com/google/daq/mqtt/sequencer/SequenceRunnerTest.java
+++ b/validator/src/test/java/com/google/daq/mqtt/sequencer/SequenceRunnerTest.java
@@ -1,12 +1,11 @@
 package com.google.daq.mqtt.sequencer;
 
 import static com.google.daq.mqtt.sequencer.SequenceBase.SERIAL_NO_MISSING;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import com.google.daq.mqtt.TestCommon;
-import com.google.daq.mqtt.util.ValidatorConfig;
 import org.junit.Test;
+import udmi.schema.ExecutionConfiguration;
 
 /**
  * Unit tests for sequence runner (not to be confused with sequence tests themselves).
@@ -15,8 +14,8 @@ public class SequenceRunnerTest {
 
   private static final String TEST_DEVICE = "AHU-1";
 
-  private ValidatorConfig getValidatorConfig() {
-    ValidatorConfig validatorConfig = new ValidatorConfig();
+  private ExecutionConfiguration getExecutionConfiguration() {
+    ExecutionConfiguration validatorConfig = new ExecutionConfiguration();
     validatorConfig.project_id = TestCommon.PROJECT_ID;
     validatorConfig.site_model = TestCommon.SITE_DIR;
     validatorConfig.log_level = TestCommon.LOG_LEVEL;
@@ -27,7 +26,7 @@ private ValidatorConfig getValidatorConfig() {
 
   @Test
   public void processSite() {
-    ValidatorConfig config = getValidatorConfig();
+    ExecutionConfiguration config = getExecutionConfiguration();
     SequenceRunner sequenceRunner = SequenceRunner.processConfig(config);
     // TODO: SequenceRunner is not properly mocked, so everything fails.
     assertTrue("many failures", sequenceRunner.getFailures().size() > 10);
@@ -35,7 +34,7 @@ public void processSite() {
 
   @Test
   public void processDevice() {
-    ValidatorConfig config = getValidatorConfig();
+    ExecutionConfiguration config = getExecutionConfiguration();
     config.device_id = TEST_DEVICE;
     SequenceRunner sequenceRunner = SequenceRunner.processConfig(config);
     // TODO: SequenceRunner is not properly mocked, so everything fails.
diff --git a/validator/src/test/java/com/google/daq/mqtt/validator/PlaybackTest.java b/validator/src/test/java/com/google/daq/mqtt/validator/PlaybackTest.java
index bd516d2562..8fcee9993b 100644
--- a/validator/src/test/java/com/google/daq/mqtt/validator/PlaybackTest.java
+++ b/validator/src/test/java/com/google/daq/mqtt/validator/PlaybackTest.java
@@ -4,8 +4,8 @@
 import static org.junit.Assert.assertNull;
 
 import com.google.daq.mqtt.TestCommon;
-import com.google.daq.mqtt.util.JsonUtil;
 import com.google.daq.mqtt.validator.MessageReadingClient.OutputBundle;
+import com.google.udmi.util.JsonUtil;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeMap;
diff --git a/validator/traces/simple.out/devices/AHU-22/event_pointset.out b/validator/traces/simple.out/devices/AHU-22/event_pointset.out
index 5cbbfeb2f8..6e049c9c8c 100644
--- a/validator/traces/simple.out/devices/AHU-22/event_pointset.out
+++ b/validator/traces/simple.out/devices/AHU-22/event_pointset.out
@@ -5,7 +5,7 @@
   "sub_type" : "event",
   "status" : {
     "message" : "While converting to json node: 2 schema violations found",
-    "detail" : "While converting to json node: 2 schema violations found @Validator.validateMessage(Validator.java:417); 2 schema violations found; object instance has properties which are not allowed by the schema: [\"yesvalue\"]; object has missing required properties ([\"version\"])",
+    "detail" : "While converting to json node: 2 schema violations found @Validator.validateMessage(redacted); 2 schema violations found; object instance has properties which are not allowed by the schema: [\"yesvalue\"]; object has missing required properties ([\"version\"])",
     "category" : "validation.error.simple",
     "timestamp" : "1999-10-20T01:02:03Z",
     "level" : 500
diff --git a/validator/traces/simple.out/devices/AHU-22/event_system.out b/validator/traces/simple.out/devices/AHU-22/event_system.out
index f004fca0b7..aac1b99210 100644
--- a/validator/traces/simple.out/devices/AHU-22/event_system.out
+++ b/validator/traces/simple.out/devices/AHU-22/event_system.out
@@ -5,7 +5,7 @@
   "sub_type" : "event",
   "status" : {
     "message" : "While converting to json node: 1 schema violations found",
-    "detail" : "While converting to json node: 1 schema violations found @Validator.validateMessage(Validator.java:417); 1 schema violations found; instance entry category not recognized",
+    "detail" : "While converting to json node: 1 schema violations found @Validator.validateMessage(redacted); 1 schema violations found; instance entry category not recognized",
     "category" : "validation.error.simple",
     "timestamp" : "1999-10-20T01:02:03Z",
     "level" : 500
diff --git a/validator/validator.iml b/validator/validator.iml
index 2656a703c9..c4a20769fa 100644
--- a/validator/validator.iml
+++ b/validator/validator.iml
@@ -4,9 +4,12 @@
     <output url="file://$MODULE_DIR$/out/production/classes" />
     <output-test url="file://$MODULE_DIR$/out/test/classes" />
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../common">
+    <content url="file://$MODULE_DIR$/../common/src/main">
       <sourceFolder url="file://$MODULE_DIR$/../common/src/main/java" isTestSource="false" />
     </content>
+    <content url="file://$MODULE_DIR$/../common/src/test">
+      <sourceFolder url="file://$MODULE_DIR$/../common/src/test/java" isTestSource="true" />
+    </content>
     <content url="file://$MODULE_DIR$/../gencode">
       <sourceFolder url="file://$MODULE_DIR$/../gencode/java" isTestSource="false" />
     </content>