diff --git a/src/main/java/com/target/devicemanager/components/check/MicrConfig.java b/src/main/java/com/target/devicemanager/components/check/MicrConfig.java
index 332766a..a9ac060 100644
--- a/src/main/java/com/target/devicemanager/components/check/MicrConfig.java
+++ b/src/main/java/com/target/devicemanager/components/check/MicrConfig.java
@@ -4,6 +4,7 @@
 import com.target.devicemanager.common.DeviceConnector;
 import com.target.devicemanager.common.DevicePower;
 import com.target.devicemanager.common.DynamicDevice;
+import com.target.devicemanager.common.SimulatedDynamicDevice;
 import com.target.devicemanager.components.check.simulator.SimulatedJposMicr;
 import com.target.devicemanager.configuration.ApplicationConfig;
 import jpos.MICR;
@@ -32,7 +33,7 @@ public MicrManager getMicrManager() {
         JposEntryRegistry deviceRegistry = JposServiceLoader.getManager().getEntryRegistry();
 
         if (applicationConfig.IsSimulationMode()) {
-            dynamicMicr = new DynamicDevice<>(simulatedMicr, new DevicePower(), new DeviceConnector<>(simulatedMicr, deviceRegistry));
+            dynamicMicr = new SimulatedDynamicDevice<>(simulatedMicr, new DevicePower(), new DeviceConnector<>(simulatedMicr, deviceRegistry));
         } else {
             MICR micr = new MICR();
             dynamicMicr = new DynamicDevice<>(micr, new DevicePower(), new DeviceConnector<>(micr, deviceRegistry));
diff --git a/src/main/java/com/target/devicemanager/components/check/simulator/SimulatedJposMicr.java b/src/main/java/com/target/devicemanager/components/check/simulator/SimulatedJposMicr.java
index e5afb92..9884eec 100644
--- a/src/main/java/com/target/devicemanager/components/check/simulator/SimulatedJposMicr.java
+++ b/src/main/java/com/target/devicemanager/components/check/simulator/SimulatedJposMicr.java
@@ -32,11 +32,6 @@ public boolean getDeviceEnabled() {
         return true;
     }
 
-    @Override
-    public boolean getClaimed() {
-        return true;
-    }
-
     @Override
     public int getState() {
         return simulatorState == SimulatorState.ONLINE ? JposConst.JPOS_S_IDLE : JposConst.JPOS_S_CLOSED;
diff --git a/src/main/java/com/target/devicemanager/components/linedisplay/LineDisplayConfig.java b/src/main/java/com/target/devicemanager/components/linedisplay/LineDisplayConfig.java
index d89690c..84960dd 100644
--- a/src/main/java/com/target/devicemanager/components/linedisplay/LineDisplayConfig.java
+++ b/src/main/java/com/target/devicemanager/components/linedisplay/LineDisplayConfig.java
@@ -30,7 +30,7 @@ public LineDisplayManager getLineDisplayManager() {
         JposEntryRegistry deviceRegistry = JposServiceLoader.getManager().getEntryRegistry();
 
         if (applicationConfig.IsSimulationMode()) {
-            dynamicLineDisplay = new DynamicDevice<>(simulatedLineDisplay, new DevicePower(), new DeviceConnector<>(simulatedLineDisplay, deviceRegistry));
+            dynamicLineDisplay = new SimulatedDynamicDevice<>(simulatedLineDisplay, new DevicePower(), new DeviceConnector<>(simulatedLineDisplay, deviceRegistry));
         } else {
             LineDisplay lineDisplay = new LineDisplay();
             dynamicLineDisplay = new DynamicDevice<>(lineDisplay, new DevicePower(), new DeviceConnector<>(lineDisplay, deviceRegistry ));
diff --git a/src/main/java/com/target/devicemanager/components/linedisplay/simulator/SimulatedJposLineDisplay.java b/src/main/java/com/target/devicemanager/components/linedisplay/simulator/SimulatedJposLineDisplay.java
index d42f8fa..886fa20 100644
--- a/src/main/java/com/target/devicemanager/components/linedisplay/simulator/SimulatedJposLineDisplay.java
+++ b/src/main/java/com/target/devicemanager/components/linedisplay/simulator/SimulatedJposLineDisplay.java
@@ -41,11 +41,6 @@ public boolean getDeviceEnabled() {
         return true;
     }
 
-    @Override
-    public boolean getClaimed() {
-        return true;
-    }
-
     @Override
     public int getCapPowerReporting() {
         return JPOS_PR_STANDARD;