diff --git a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetAgent.java b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetAgent.java
index 96ce4c716a..aec8fae033 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetAgent.java
@@ -35,7 +35,7 @@ public class ArtnetAgent extends IoAgent<ArtnetAgent, ArtnetProtocol, AgentLink.
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ArtnetAgent() {
+    protected ArtnetAgent() {
     }
 
     public ArtnetAgent(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetLightAsset.java b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetLightAsset.java
index b812d1e14c..9feb42438d 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetLightAsset.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/artnet/ArtnetLightAsset.java
@@ -31,8 +31,7 @@ public class ArtnetLightAsset extends LightAsset {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ArtnetLightAsset() {
-        this(null);
+    protected ArtnetLightAsset() {
     }
 
     protected ArtnetLightAsset(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerAgent.java b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerAgent.java
index 649f204157..ea99280eb6 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerAgent.java
@@ -104,8 +104,7 @@ public ControllerAgentLink setCommandsMap(Map<String, List<String>> commandsMap)
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ControllerAgent() {
-        this(null);
+    protected ControllerAgent() {
     }
 
     public ControllerAgent(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventAgent.java b/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventAgent.java
index 216e99cea3..c94e535ea2 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/event/ClientEventAgent.java
@@ -45,8 +45,7 @@ public class ClientEventAgent extends Agent<ClientEventAgent, ClientEventProtoco
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ClientEventAgent() {
-        this(null);
+    protected ClientEventAgent() {
     }
 
 
diff --git a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientAgent.java b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientAgent.java
index a2ba442039..2bdc8ebb36 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/http/HttpClientAgent.java
@@ -140,11 +140,9 @@ public HttpClientAgentLink setPollingAttribute(String pollingAttribute) {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    HttpClientAgent() {
-        this(null);
+    protected HttpClientAgent() {
     }
 
-
     public HttpClientAgent(String name) {
         super(name);
     }
diff --git a/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgent.java b/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgent.java
index f49238bdb2..cc12dcbd63 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/knx/KNXAgent.java
@@ -98,8 +98,7 @@ public KNXAgentLink setStatusGroupAddress(String statusGroupAddress) {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    KNXAgent() {
-        this(null);
+    protected KNXAgent() {
     }
 
     public KNXAgent(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/macro/MacroAgent.java b/agent/src/main/java/org/openremote/agent/protocol/macro/MacroAgent.java
index 07b4da3894..77e9eccd8f 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/macro/MacroAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/macro/MacroAgent.java
@@ -71,8 +71,7 @@ public MacroAgentLink setActionIndex(Integer actionIndex) {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    MacroAgent() {
-        this(null);
+    protected MacroAgent() {
     }
 
     public MacroAgent(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/serial/SerialAgent.java b/agent/src/main/java/org/openremote/agent/protocol/serial/SerialAgent.java
index db2c81f0b5..6c093298b2 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/serial/SerialAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/serial/SerialAgent.java
@@ -35,7 +35,7 @@ public class SerialAgent extends IoAgent<SerialAgent, SerialClientProtocol, Agen
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    SerialAgent() {
+    protected SerialAgent() {
     }
 
     public SerialAgent(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorAgent.java b/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorAgent.java
index a8696894c6..87c29f2faf 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/simulator/SimulatorAgent.java
@@ -61,8 +61,7 @@ public SimulatorAgentLink setSimulatorReplayData(SimulatorReplayDatapoint[] simu
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    SimulatorAgent() {
-        this(null);
+    protected SimulatorAgent() {
     }
 
     public SimulatorAgent(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/tcp/TcpClientAgent.java b/agent/src/main/java/org/openremote/agent/protocol/tcp/TcpClientAgent.java
index fc343c67e3..3a35cacbc7 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/tcp/TcpClientAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/tcp/TcpClientAgent.java
@@ -35,7 +35,7 @@ public class TcpClientAgent extends IoAgent<TcpClientAgent, TcpClientProtocol, A
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    TcpClientAgent() {
+    protected TcpClientAgent() {
     }
 
     public TcpClientAgent(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/timer/TimerAgent.java b/agent/src/main/java/org/openremote/agent/protocol/timer/TimerAgent.java
index dc866c3719..7369d23762 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/timer/TimerAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/timer/TimerAgent.java
@@ -69,8 +69,7 @@ public TimerAgentLink setTimerValue(TimerValue timerValue) {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    TimerAgent() {
-        this(null);
+    protected TimerAgent() {
     }
 
     public TimerAgent(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriAgent.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriAgent.java
index 092184dac6..7da403ab3f 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriAgent.java
@@ -43,8 +43,7 @@ public class TradfriAgent extends Agent<TradfriAgent, TradfriProtocol, AgentLink
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    TradfriAgent() {
-        this(null);
+    protected TradfriAgent() {
     }
 
     public TradfriAgent(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriLightAsset.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriLightAsset.java
index ad5dff0baf..eaecb99d92 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriLightAsset.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriLightAsset.java
@@ -20,8 +20,7 @@ public class TradfriLightAsset extends LightAsset implements TradfriAsset {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    TradfriLightAsset() {
-        this(null);
+    protected TradfriLightAsset() {
     }
 
     public TradfriLightAsset(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriPlugAsset.java b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriPlugAsset.java
index 140fe5c55b..fc1fd0fe40 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriPlugAsset.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/tradfri/TradfriPlugAsset.java
@@ -21,8 +21,7 @@ public class TradfriPlugAsset extends PlugAsset implements TradfriAsset {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    TradfriPlugAsset() {
-        this(null);
+    protected TradfriPlugAsset() {
     }
 
     public TradfriPlugAsset(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/udp/UdpClientAgent.java b/agent/src/main/java/org/openremote/agent/protocol/udp/UdpClientAgent.java
index d11063c75c..0e10fca24b 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/udp/UdpClientAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/udp/UdpClientAgent.java
@@ -35,7 +35,7 @@ public class UdpClientAgent extends IoAgent<UdpClientAgent, UdpClientProtocol, A
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    UdpClientAgent() {
+    protected UdpClientAgent() {
     }
 
     public UdpClientAgent(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java
index feebd97128..e359d99e77 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusSerialAgent.java
@@ -36,7 +36,7 @@ public class VelbusSerialAgent extends VelbusAgent<VelbusSerialAgent, VelbusSeri
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    VelbusSerialAgent() {
+    protected VelbusSerialAgent() {
     }
 
     public VelbusSerialAgent(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusTcpAgent.java b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusTcpAgent.java
index 7789a14d2d..78f362de17 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusTcpAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/velbus/VelbusTcpAgent.java
@@ -37,7 +37,7 @@ public class VelbusTcpAgent extends VelbusAgent<VelbusTcpAgent, VelbusTcpProtoco
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    VelbusTcpAgent() {
+    protected VelbusTcpAgent() {
     }
 
     public VelbusTcpAgent(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClientAgent.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClientAgent.java
index 5485bf4757..be074bf391 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClientAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClientAgent.java
@@ -80,7 +80,7 @@ public WebsocketClientAgentLink setWebsocketSubscriptions(WebsocketSubscription[
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    WebsocketClientAgent() {
+    protected WebsocketClientAgent() {
     }
 
     public WebsocketClientAgent(String name) {
diff --git a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWAgent.java b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWAgent.java
index cee3219240..c112bcb539 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWAgent.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/zwave/ZWAgent.java
@@ -65,8 +65,7 @@ public Optional<String> getDeviceValue() {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ZWAgent() {
-        this(null);
+    protected ZWAgent() {
     }
 
     public ZWAgent(String name) {
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.json
index d587db0342..e14d903074 100644
--- a/deployment/manager/shared/locales/en/or.json
+++ b/deployment/manager/shared/locales/en/or.json
@@ -393,5 +393,7 @@
   "repetitionEnds": "Repetition ends",
   "repeatOccurrenceEvery": "Repeat occurrence every",
   "daysOfTheWeek": "days of the week",
+  "dismiss": "dismiss",
+  "createAssetFailed": "Failed to create asset",
   "logCategory": {}
 }
diff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.java
index 0abbea087b..b476a61c3c 100644
--- a/model/src/main/java/org/openremote/model/asset/Asset.java
+++ b/model/src/main/java/org/openremote/model/asset/Asset.java
@@ -40,14 +40,8 @@
 
 import javax.persistence.*;
 import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Optional;
+import javax.validation.constraints.*;
+import java.util.*;
 
 import static javax.persistence.DiscriminatorType.STRING;
 import static org.openremote.model.Constants.PERSISTENCE_JSON_VALUE_TYPE;
@@ -364,7 +358,8 @@ public String getName() {
     }
 
 
-    public T setName(String name) throws IllegalArgumentException {
+    public T setName(@NotNull String name) throws IllegalArgumentException {
+        Objects.requireNonNull(name);
         this.name = name;
         return (T) this;
     }
diff --git a/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.java b/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.java
index 6eb07a8128..615cfb64be 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.java
@@ -48,8 +48,7 @@ public class BuildingAsset extends CityAsset {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    BuildingAsset() {
-        this(null);
+    protected BuildingAsset() {
     }
 
     public BuildingAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/CityAsset.java b/model/src/main/java/org/openremote/model/asset/impl/CityAsset.java
index ccb5a9dc9f..66333d8398 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/CityAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/CityAsset.java
@@ -40,8 +40,7 @@ public class CityAsset extends Asset<CityAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    CityAsset() {
-        this(null);
+    protected CityAsset() {
     }
 
     public CityAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ConsoleAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ConsoleAsset.java
index 5508a491a8..79de4a2764 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ConsoleAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ConsoleAsset.java
@@ -43,8 +43,7 @@ public class ConsoleAsset extends Asset<ConsoleAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ConsoleAsset() {
-        this(null);
+    protected ConsoleAsset() {
     }
 
     public ConsoleAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.java
index b812309d90..20eaeeda97 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.java
@@ -42,8 +42,7 @@ public class DoorSensorAsset extends Asset<DoorSensorAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    DoorSensorAsset() {
-        this(null);
+    protected DoorSensorAsset() {
     }
 
     public DoorSensorAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java
index 60b50c5317..f63754d896 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java
@@ -60,8 +60,7 @@ public class ElectricVehicleAsset extends ElectricityBatteryAsset {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ElectricVehicleAsset() {
-        this(null);
+    protected ElectricVehicleAsset() {
     }
 
     public ElectricVehicleAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.java
index a8e370ae01..89f21a4a0f 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleFleetGroupAsset.java
@@ -47,7 +47,7 @@ public class ElectricVehicleFleetGroupAsset extends GroupAsset {
 
     public static final AssetDescriptor<ElectricVehicleFleetGroupAsset> DESCRIPTOR = new AssetDescriptor<>("car-multiple", "49B0D8", ElectricVehicleFleetGroupAsset.class);
 
-    ElectricVehicleFleetGroupAsset() {
+    protected ElectricVehicleFleetGroupAsset() {
     }
 
     public ElectricVehicleFleetGroupAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityAsset.java
index 8f592a766c..60cb12425d 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityAsset.java
@@ -75,8 +75,7 @@ public abstract class ElectricityAsset<T extends ElectricityAsset<?>> extends As
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ElectricityAsset() {
-        this(null);
+    protected ElectricityAsset() {
     }
 
     public ElectricityAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.java
index 257cec3922..b3c5c70954 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityBatteryAsset.java
@@ -37,7 +37,7 @@ public class ElectricityBatteryAsset extends ElectricityStorageAsset {
 
     public static final AssetDescriptor<ElectricityBatteryAsset> DESCRIPTOR = new AssetDescriptor<>("battery-charging", "1B7C89", ElectricityBatteryAsset.class);
 
-    ElectricityBatteryAsset() {
+    protected ElectricityBatteryAsset() {
     }
 
     public ElectricityBatteryAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java
index 2211daebf6..0f24e98cf6 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java
@@ -71,8 +71,7 @@ public enum ConnectorType {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ElectricityChargerAsset() {
-        this(null);
+    protected ElectricityChargerAsset() {
     }
 
     public ElectricityChargerAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.java
index a79d4821ea..fdee414c0b 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityConsumerAsset.java
@@ -50,8 +50,7 @@ public class ElectricityConsumerAsset extends ElectricityAsset<ElectricityConsum
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ElectricityConsumerAsset() {
-        this(null);
+    protected ElectricityConsumerAsset() {
     }
 
     public ElectricityConsumerAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java
index a6d0318ff8..8ff25b9c0c 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerAsset.java
@@ -46,7 +46,6 @@ public class ElectricityProducerAsset extends ElectricityAsset<ElectricityProduc
      * For use by hydrators (i.e. JPA/Jackson)
      */
     ElectricityProducerAsset() {
-        this(null);
     }
 
     public ElectricityProducerAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java
index f3a6e072e8..15a7912b27 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerSolarAsset.java
@@ -55,8 +55,7 @@ public enum PanelOrientation {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ElectricityProducerSolarAsset() {
-        this(null);
+    protected ElectricityProducerSolarAsset() {
     }
 
     public ElectricityProducerSolarAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.java
index e86e683874..4cfdb3e078 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityProducerWindAsset.java
@@ -43,7 +43,10 @@ public class ElectricityProducerWindAsset extends ElectricityProducerAsset {
 
     public static final AssetDescriptor<ElectricityProducerWindAsset> DESCRIPTOR = new AssetDescriptor<>("wind-turbine", "4B87EA", ElectricityProducerWindAsset.class);
 
-    ElectricityProducerWindAsset() {
+    /**
+     * For use by hydrators (i.e. JPA/Jackson)
+     */
+    protected ElectricityProducerWindAsset() {
     }
 
     public ElectricityProducerWindAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityStorageAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityStorageAsset.java
index 21d9a60f6f..1121e7f006 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityStorageAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityStorageAsset.java
@@ -59,8 +59,7 @@ public abstract class ElectricityStorageAsset extends ElectricityAsset<Electrici
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ElectricityStorageAsset() {
-        this(null);
+    protected ElectricityStorageAsset() {
     }
 
     public ElectricityStorageAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.java
index 27c2461d77..657969ba83 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricitySupplierAsset.java
@@ -57,8 +57,7 @@ public class ElectricitySupplierAsset extends ElectricityAsset<ElectricitySuppli
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ElectricitySupplierAsset() {
-        this(null);
+    protected ElectricitySupplierAsset() {
     }
 
     public ElectricitySupplierAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/EnvironmentSensorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/EnvironmentSensorAsset.java
index 010587e57a..1640d93a3f 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/EnvironmentSensorAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/EnvironmentSensorAsset.java
@@ -63,8 +63,7 @@ public class EnvironmentSensorAsset extends Asset<EnvironmentSensorAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    EnvironmentSensorAsset() {
-        this(null);
+    protected EnvironmentSensorAsset() {
     }
 
     public EnvironmentSensorAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/GatewayAsset.java b/model/src/main/java/org/openremote/model/asset/impl/GatewayAsset.java
index ae56b8bf62..76d8aaf528 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/GatewayAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/GatewayAsset.java
@@ -41,8 +41,7 @@ public class GatewayAsset extends Asset<GatewayAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    GatewayAsset() {
-        this(null);
+    protected GatewayAsset() {
     }
 
     public GatewayAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/GroundwaterSensorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/GroundwaterSensorAsset.java
index a525dc8fc3..f9446d3f4e 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/GroundwaterSensorAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/GroundwaterSensorAsset.java
@@ -47,8 +47,7 @@ public class GroundwaterSensorAsset extends Asset<GroundwaterSensorAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    GroundwaterSensorAsset() {
-        this(null);
+    protected GroundwaterSensorAsset() {
     }
 
     public GroundwaterSensorAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java b/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java
index 23247af055..ff4de5b508 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java
@@ -41,8 +41,7 @@ public class GroupAsset extends Asset<GroupAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    GroupAsset() {
-        super(null);
+    protected GroupAsset() {
     }
 
     public GroupAsset(String name, Class<? extends Asset<?>> childAssetType) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/LightAsset.java b/model/src/main/java/org/openremote/model/asset/impl/LightAsset.java
index 0189294521..b3052ca94a 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/LightAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/LightAsset.java
@@ -49,8 +49,7 @@ public class LightAsset extends Asset<LightAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    LightAsset() {
-        this(null);
+    protected LightAsset() {
     }
 
     public LightAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/MicrophoneAsset.java b/model/src/main/java/org/openremote/model/asset/impl/MicrophoneAsset.java
index 13eb58ba5b..b6f27770ee 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/MicrophoneAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/MicrophoneAsset.java
@@ -40,8 +40,7 @@ public class MicrophoneAsset extends Asset<MicrophoneAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    MicrophoneAsset() {
-        this(null);
+    protected MicrophoneAsset() {
     }
 
     public MicrophoneAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ParkingAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ParkingAsset.java
index a98f7b55d0..fa4eaf02f7 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ParkingAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ParkingAsset.java
@@ -44,8 +44,7 @@ public class ParkingAsset extends Asset<ParkingAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ParkingAsset() {
-        this(null);
+    protected ParkingAsset() {
     }
 
     public ParkingAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/PeopleCounterAsset.java b/model/src/main/java/org/openremote/model/asset/impl/PeopleCounterAsset.java
index a9a832b49d..1149a0d14b 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/PeopleCounterAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/PeopleCounterAsset.java
@@ -42,8 +42,7 @@ public class PeopleCounterAsset extends Asset<PeopleCounterAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    PeopleCounterAsset() {
-        this(null);
+    protected PeopleCounterAsset() {
     }
 
     public PeopleCounterAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/PlugAsset.java b/model/src/main/java/org/openremote/model/asset/impl/PlugAsset.java
index 08d9459dd0..baa34c2727 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/PlugAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/PlugAsset.java
@@ -39,8 +39,7 @@ public class PlugAsset extends Asset<PlugAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    PlugAsset() {
-        this(null);
+    protected PlugAsset() {
     }
 
     public PlugAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/PresenceSensorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/PresenceSensorAsset.java
index 807c63956c..240aac4146 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/PresenceSensorAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/PresenceSensorAsset.java
@@ -40,8 +40,7 @@ public class PresenceSensorAsset extends Asset<PresenceSensorAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    PresenceSensorAsset() {
-        this(null);
+    protected PresenceSensorAsset() {
     }
 
     public PresenceSensorAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/RoomAsset.java b/model/src/main/java/org/openremote/model/asset/impl/RoomAsset.java
index 70c89ca897..24b84fb264 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/RoomAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/RoomAsset.java
@@ -41,8 +41,11 @@ public class RoomAsset extends Asset<RoomAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    RoomAsset() {
-        this(null);
+    protected RoomAsset() {
+    }
+    
+    public RoomAsset(String name) {
+        super(name);
     }
 
     public Optional<Integer> getArea() {
@@ -52,8 +55,4 @@ public Optional<Integer> getArea() {
     public Optional<Integer> getRoomNumber() {
         return getAttributes().getValue(ROOM_NUMBER);
     }
-
-    public RoomAsset(String name) {
-        super(name);
-    }
 }
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ShipAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ShipAsset.java
index 475e49090f..49eb607706 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ShipAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ShipAsset.java
@@ -51,7 +51,7 @@ public class ShipAsset extends Asset<ShipAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ShipAsset() {
+    protected ShipAsset() {
     }
 
     public ShipAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ThermostatAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ThermostatAsset.java
index def8272341..54d9cfc918 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ThermostatAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ThermostatAsset.java
@@ -47,8 +47,7 @@ public class ThermostatAsset extends Asset<ThermostatAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ThermostatAsset() {
-        this(null);
+    protected ThermostatAsset() {
     }
 
     public ThermostatAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ThingAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ThingAsset.java
index ea329f4ea5..99d73e7b4b 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/ThingAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/ThingAsset.java
@@ -36,7 +36,7 @@ public class ThingAsset extends Asset<ThingAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    ThingAsset() {
+    protected ThingAsset() {
     }
 
     public ThingAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/UnknownAsset.java b/model/src/main/java/org/openremote/model/asset/impl/UnknownAsset.java
index c677143762..44383aad80 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/UnknownAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/UnknownAsset.java
@@ -37,6 +37,6 @@ public class UnknownAsset extends Asset<UnknownAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    UnknownAsset() {
+    protected UnknownAsset() {
     }
 }
diff --git a/model/src/main/java/org/openremote/model/asset/impl/VentilationAsset.java b/model/src/main/java/org/openremote/model/asset/impl/VentilationAsset.java
index 2e51ea0d8f..52b5b28917 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/VentilationAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/VentilationAsset.java
@@ -43,8 +43,7 @@ public class VentilationAsset extends Asset<VentilationAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    VentilationAsset() {
-        this(null);
+    protected VentilationAsset() {
     }
 
     public VentilationAsset(String name) {
diff --git a/model/src/main/java/org/openremote/model/asset/impl/WeatherAsset.java b/model/src/main/java/org/openremote/model/asset/impl/WeatherAsset.java
index 5e6e9125ab..b21584461b 100644
--- a/model/src/main/java/org/openremote/model/asset/impl/WeatherAsset.java
+++ b/model/src/main/java/org/openremote/model/asset/impl/WeatherAsset.java
@@ -72,8 +72,7 @@ public class WeatherAsset extends Asset<WeatherAsset> {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    WeatherAsset() {
-        this(null);
+    protected WeatherAsset() {
     }
 
     public WeatherAsset(String name) {
diff --git a/test/src/main/groovy/org/openremote/test/protocol/MockAgent.java b/test/src/main/groovy/org/openremote/test/protocol/MockAgent.java
index 32545634f6..7a1076b474 100644
--- a/test/src/main/groovy/org/openremote/test/protocol/MockAgent.java
+++ b/test/src/main/groovy/org/openremote/test/protocol/MockAgent.java
@@ -61,8 +61,7 @@ public MockAgentLink setRequiredValue(String requiredValue) {
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    MockAgent() {
-        this(null);
+    protected MockAgent() {
     }
 
     public MockAgent(String name) {
diff --git a/test/src/main/groovy/org/openremote/test/protocol/http/HttpServerTestAgent.java b/test/src/main/groovy/org/openremote/test/protocol/http/HttpServerTestAgent.java
index c0e71494fd..b5338f58ad 100644
--- a/test/src/main/groovy/org/openremote/test/protocol/http/HttpServerTestAgent.java
+++ b/test/src/main/groovy/org/openremote/test/protocol/http/HttpServerTestAgent.java
@@ -32,7 +32,7 @@ public class HttpServerTestAgent extends AbstractHttpServerAgent<HttpServerTestA
         HttpServerTestAgent.class, TestHttpServerProtocol.class, AgentLink.Default.class
     );
 
-    HttpServerTestAgent() {}
+    protected HttpServerTestAgent() {}
 
     public HttpServerTestAgent(String name) {
         super(name);
diff --git a/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusAgent.java b/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusAgent.java
index beb4904679..5b316eb216 100644
--- a/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusAgent.java
+++ b/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusAgent.java
@@ -34,7 +34,7 @@ public class MockVelbusAgent extends VelbusAgent<MockVelbusAgent, MockVelbusProt
     /**
      * For use by hydrators (i.e. JPA/Jackson)
      */
-    MockVelbusAgent() {
+    protected MockVelbusAgent() {
     }
 
     public MockVelbusAgent(String name) {