diff --git a/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.nuspec b/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.nuspec
index 4abb43c..2e07d65 100644
--- a/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.nuspec
+++ b/Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Modbus.Net.Modbus</id>
-        <version>1.2.3.2</version>
+        <version>1.2.4</version>
         <title>Modbus.Net.Modbus</title>
         <authors>Chris L.(Luo Sheng)</authors>
         <owners>Hangzhou Delian IoT Science Technology Co.,Ltd.</owners>
@@ -13,7 +13,7 @@
         <copyright>Copyright 2017 Hangzhou Delian IoT Science Technology Co.,Ltd.</copyright>
         <tags>hardware communicate protocal modbus Delian</tags>
         <dependencies>
-            <dependency id="Modbus.Net" version="1.2.3.2" />
+            <dependency id="Modbus.Net" version="1.2.4" />
         </dependencies>
     </metadata>
   <files>
diff --git a/Modbus.Net/Modbus.Net.Modbus/Properties/AssemblyInfo.cs b/Modbus.Net/Modbus.Net.Modbus/Properties/AssemblyInfo.cs
index ec13ce6..09ecdc4 100644
--- a/Modbus.Net/Modbus.Net.Modbus/Properties/AssemblyInfo.cs
+++ b/Modbus.Net/Modbus.Net.Modbus/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.3")]
-[assembly: AssemblyFileVersion("1.2.3")]
+[assembly: AssemblyVersion("1.2.4")]
+[assembly: AssemblyFileVersion("1.2.4")]
diff --git a/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.nuspec b/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.nuspec
index e8e8965..27bd364 100644
--- a/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.nuspec
+++ b/Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.nuspec
@@ -13,7 +13,7 @@
         <copyright>Copyright 2017 Hangzhou Delian IoT Science Technology Co.,Ltd.</copyright>
         <tags>hardware communicate protocal OPC DA Delian</tags>
         <dependencies>
-            <dependency id="Modbus.Net" version="1.2.3.2" />
+            <dependency id="Modbus.Net" version="1.2.4" />
             <dependency id="H.Opc" version="0.8.1" />
         </dependencies>
     </metadata>
diff --git a/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.nuspec b/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.nuspec
index 82af50d..1be25ce 100644
--- a/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.nuspec
+++ b/Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Modbus.Net.Siemens</id>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <title>Modbus.Net.Siemens</title>
         <authors>Chris L.(Luo Sheng)</authors>
         <owners>Hangzhou Delian IoT Science Technology Co.,Ltd.</owners>
@@ -13,7 +13,7 @@
         <copyright>Copyright 2017 Hangzhou Delian IoT Science Technology Co.,Ltd.</copyright>
         <tags>hardware communicate protocal Siemens profinet Delian</tags>
         <dependencies>
-            <dependency id="Modbus.Net" version="1.2.3.2" />
+            <dependency id="Modbus.Net" version="1.2.4" />
         </dependencies>
     </metadata>
   <files>
diff --git a/Modbus.Net/Modbus.Net.Siemens/Properties/AssemblyInfo.cs b/Modbus.Net/Modbus.Net.Siemens/Properties/AssemblyInfo.cs
index 7c69fed..0313934 100644
--- a/Modbus.Net/Modbus.Net.Siemens/Properties/AssemblyInfo.cs
+++ b/Modbus.Net/Modbus.Net.Siemens/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.3")]
-[assembly: AssemblyFileVersion("1.2.3")]
+[assembly: AssemblyVersion("1.2.4")]
+[assembly: AssemblyFileVersion("1.2.4")]
diff --git a/Modbus.Net/Modbus.Net/BaseUtility.cs b/Modbus.Net/Modbus.Net/BaseUtility.cs
index ee2b9f9..fc26997 100644
--- a/Modbus.Net/Modbus.Net/BaseUtility.cs
+++ b/Modbus.Net/Modbus.Net/BaseUtility.cs
@@ -52,7 +52,7 @@ namespace Modbus.Net
         /// <summary>
         ///     标识设备的连接关键字
         /// </summary>
-        public string ConnectionToken => Wrapper.ProtocalLinker.ConnectionToken;
+        public string ConnectionToken => Wrapper?.ProtocalLinker == null ? ConnectionString : Wrapper.ProtocalLinker.ConnectionToken;
 
         /// <summary>
         ///     地址翻译器
diff --git a/Modbus.Net/Modbus.Net/ModBus.Net.nuspec b/Modbus.Net/Modbus.Net/ModBus.Net.nuspec
index a66ad0c..e2680e0 100644
--- a/Modbus.Net/Modbus.Net/ModBus.Net.nuspec
+++ b/Modbus.Net/Modbus.Net/ModBus.Net.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Modbus.Net</id>
-        <version>1.2.3.2</version>
+        <version>1.2.4</version>
         <title>Modbus.Net</title>
         <authors>Chris L.(Luo Sheng)</authors>
         <owners>Hangzhou Delian IoT Science Technology Co.,Ltd.</owners>
diff --git a/Modbus.Net/Modbus.Net/Properties/AssemblyInfo.cs b/Modbus.Net/Modbus.Net/Properties/AssemblyInfo.cs
index f30fc33..9096ba7 100644
--- a/Modbus.Net/Modbus.Net/Properties/AssemblyInfo.cs
+++ b/Modbus.Net/Modbus.Net/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.2.3")]
-[assembly: AssemblyFileVersion("1.2.3")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.4")]
+[assembly: AssemblyFileVersion("1.2.4")]
\ No newline at end of file
diff --git a/Tests/Modbus.Net.Tests/BaseTest.cs b/Tests/Modbus.Net.Tests/BaseTest.cs
index f09620f..45f9b1a 100644
--- a/Tests/Modbus.Net.Tests/BaseTest.cs
+++ b/Tests/Modbus.Net.Tests/BaseTest.cs
@@ -1,120 +1,157 @@
-using Modbus.Net;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Modbus.Net.Modbus;
+using Modbus.Net.Siemens;
 
 namespace Modbus.Net.Tests
 {
     [TestClass]
     public class BaseTest
     {
-        private List<AddressUnit> _addressUnits;
+        private List<AddressUnit<int>> _addressUnits;
+
+        private TaskManager<int> _taskManager;
+
+        private BaseMachine<int, int> _baseMachine;
+
+        private BaseMachine<int, int> _baseMachine2;
 
         [TestInitialize]
         public void Init()
         {
-            _addressUnits = new List<AddressUnit>
+            _addressUnits = new List<AddressUnit<int>>
             {
-                new AddressUnit
+                new AddressUnit<int>
                 {
+                    Id = 1,
                     Area = "3X",
                     Address = 1,
                     SubAddress = 0,
                     DataType = typeof(bool)
                 },
-                new AddressUnit
+                new AddressUnit<int>
                 {
+                    Id = 2,
                     Area = "3X",
                     Address = 1,
                     SubAddress = 1,
                     DataType = typeof(bool)
                 },
-                new AddressUnit
+                new AddressUnit<int>
                 {
+                    Id = 3,
                     Area = "3X",
                     Address = 1,
                     SubAddress = 2,
                     DataType = typeof(bool)
                 },
-                new AddressUnit
+                new AddressUnit<int>
                 {
+                    Id = 4,
                     Area = "3X",
                     Address = 2,
                     SubAddress = 0,
                     DataType = typeof(byte)
                 },
-                new AddressUnit
+                new AddressUnit<int>
                 {
+                    Id = 5,
                     Area = "3X",
                     Address = 2,
                     SubAddress = 8,
                     DataType = typeof(byte)
                 },
-                new AddressUnit
+                new AddressUnit<int>
                 {
+                    Id = 6,
                     Area = "3X",
                     Address = 3,
                     SubAddress = 0,
                     DataType = typeof(ushort)
                 },
-                new AddressUnit
+                new AddressUnit<int>
                 {
+                    Id = 7,
                     Area = "3X",
                     Address = 4,
                     SubAddress = 0,
                     DataType = typeof(ushort)
                 },
-                new AddressUnit
+                new AddressUnit<int>
                 {
+                    Id = 8,
                     Area = "3X",
                     Address = 6,
                     SubAddress = 0,
                     DataType = typeof(ushort)
                 },
-                new AddressUnit
+                new AddressUnit<int>
                 {
+                    Id = 9,
                     Area = "3X",
                     Address = 9,
                     SubAddress = 0,
                     DataType = typeof(ushort)
                 },
-                new AddressUnit
+                new AddressUnit<int>
                 {
+                    Id = 10,
                     Area = "3X",
                     Address = 10,
                     SubAddress = 0,
                     DataType = typeof(ushort)
                 },
-                new AddressUnit
+                new AddressUnit<int>
                 {
+                    Id = 11,
                     Area = "3X",
                     Address = 100,
                     SubAddress = 0,
                     DataType = typeof(ushort)
                 },
-                new AddressUnit
+                new AddressUnit<int>
                 {
+                    Id = 12,
                     Area = "4X",
                     Address = 1,
                     SubAddress = 0,
                     DataType = typeof(uint)
                 },
-                new AddressUnit
+                new AddressUnit<int>
                 {
+                    Id = 13,
                     Area = "4X",
                     Address = 4,
                     SubAddress = 0,
                     DataType = typeof(ushort)
                 },
             };
+
+            _baseMachine = new ModbusMachine<int, int>(ModbusType.Tcp, "192.168.1.1", _addressUnits, true, 2, 0)
+            {
+                Id = 1,
+                ProjectName = "Project 1",
+                MachineName = "Test 1"
+            };
+            _baseMachine2 = new SiemensMachine<int, int>(SiemensType.Tcp, "192.168.1.2", SiemensMachineModel.S7_300, _addressUnits, true, 2, 0)
+            {
+                Id = 2,
+                ProjectName = "Project 1",
+                MachineName = "Test 2"
+            };
+
+            _taskManager = new TaskManager<int>(10, 3000, true);
+
+            _taskManager.AddMachine(_baseMachine);
+            _taskManager.AddMachine(_baseMachine2);
         }
 
         [TestMethod]
         public void AddressCombinerContinusTest()
         {
-            var addressCombiner = new AddressCombinerContinus(new AddressTranslatorModbus());
+            var addressCombiner = new AddressCombinerContinus<int>(new AddressTranslatorModbus());
             var combinedAddresses = addressCombiner.Combine(_addressUnits).ToArray();
             Assert.AreEqual(combinedAddresses[0].Area, "3X");
             Assert.AreEqual(combinedAddresses[0].Address, 1);
@@ -142,7 +179,7 @@ namespace Modbus.Net.Tests
         [TestMethod]
         public void AddressCombinerSingleTest()
         {
-            var addressCombiner = new AddressCombinerSingle();
+            var addressCombiner = new AddressCombinerSingle<int>();
             var combinedAddresses = addressCombiner.Combine(_addressUnits).ToArray();
             Assert.AreEqual(combinedAddresses[0].Area, "3X");
             Assert.AreEqual(combinedAddresses[0].Address, 1);
@@ -166,7 +203,7 @@ namespace Modbus.Net.Tests
         [TestMethod]
         public void AddressCombinerNumericJumpTest()
         {
-            var addressCombiner = new AddressCombinerNumericJump(10, new AddressTranslatorModbus());
+            var addressCombiner = new AddressCombinerNumericJump<int>(10, new AddressTranslatorModbus());
             var combinedAddresses = addressCombiner.Combine(_addressUnits).ToArray();
             Assert.AreEqual(combinedAddresses[0].Area, "3X");
             Assert.AreEqual(combinedAddresses[0].Address, 1);
@@ -182,7 +219,7 @@ namespace Modbus.Net.Tests
         [TestMethod]
         public void AddressCombinerPercentageJumpTest()
         {
-            var addressCombiner = new AddressCombinerPercentageJump(30.0, new AddressTranslatorModbus());
+            var addressCombiner = new AddressCombinerPercentageJump<int>(30.0, new AddressTranslatorModbus());
             var combinedAddresses = addressCombiner.Combine(_addressUnits).ToArray();
             Assert.AreEqual(combinedAddresses[0].Area, "3X");
             Assert.AreEqual(combinedAddresses[0].Address, 1);
@@ -197,5 +234,23 @@ namespace Modbus.Net.Tests
             Assert.AreEqual(combinedAddresses[3].Address, 1);
             Assert.AreEqual(combinedAddresses[3].GetCount, 8);
         }
+
+        [TestMethod]
+        public void TaskManagerGetMachineTest()
+        {
+            var machine = _taskManager.GetMachineById<int>(1);
+            Assert.AreEqual(machine.MachineName, "Test 1");
+
+            var machine2 = _taskManager.GetMachineByConnectionToken<int>("192.168.1.2");
+            Assert.AreEqual(machine2.MachineName, "Test 2");
+        }
+
+        [TestMethod]
+        public void BaseMachineGetAddressTest()
+        {
+            var addressUnit = _baseMachine.GetAddressUnitById(1);
+            Assert.AreEqual(addressUnit.Area, "3X");
+            Assert.AreEqual(addressUnit.Address, 1);
+        }
     }
 }