diff --git a/Programs/monitor-system/data/datasource/miner.lua b/Programs/monitor-system/data/datasource/miner.lua
index 342705d..3ae01f5 100755
--- a/Programs/monitor-system/data/datasource/miner.lua
+++ b/Programs/monitor-system/data/datasource/miner.lua
@@ -2,7 +2,7 @@
 parser = require("utils.parser")
 inherits = require("utils.inherits")
 SingleBlock = require("data.datasource.single-block")
-local mock = require("data.mock.mock-multi-block")
+local mock = require("data.mock.mock-miner")
 --
 
 local Miner =
@@ -16,10 +16,10 @@ local Miner =
 
 function Miner:getName()
     local sensorInformation = self:getSensorInformation()
-    return parser.parseProblems(sensorInformation[1])
+    return parser.parseName(sensorInformation[1])
 end
 
-function Miner:getWoarkArea()
+function Miner:getWorkArea()
     local sensorInformation = self:getSensorInformation()
     return parser.parseWorkArea(sensorInformation[2])
 end
diff --git a/Programs/monitor-system/data/mock/miner.lua b/Programs/monitor-system/data/mock/mock-miner.lua
similarity index 100%
rename from Programs/monitor-system/data/mock/miner.lua
rename to Programs/monitor-system/data/mock/mock-miner.lua
diff --git a/Programs/monitor-system/domain/miner/list-miners-usecase.lua b/Programs/monitor-system/domain/miner/list-miners-usecase.lua
new file mode 100644
index 0000000..9727185
--- /dev/null
+++ b/Programs/monitor-system/domain/miner/list-miners-usecase.lua
@@ -0,0 +1,25 @@
+-- Import section
+event = require("event")
+local minerDatasource = require("data.datasource.miner")
+--
+local minerList = {}
+local newMiners = {}
+
+local function addToMinerList(_, address, machine)
+    if minerDatasource.getName(machine.getSensorInformation()) == "Multiblock Miner" then
+        if minerList[address] == nil then
+            newMiners[address] = machine
+        else
+            newMiners[address] = nil
+        end
+        minerList[address] = machine
+    end
+end
+
+event.listen("component_added", addToMinerList)
+
+local function exec()
+    return minerList, newMiners
+end
+
+return exec