diff --git a/elepower_farming/machines/composter.lua b/elepower_farming/machines/composter.lua
index 7f702c3..a762375 100644
--- a/elepower_farming/machines/composter.lua
+++ b/elepower_farming/machines/composter.lua
@@ -141,7 +141,7 @@ end
 
 ele.register_base_device("elepower_farming:composter", {
 	description = "Composter\nConvert organic matter to Biofuel",
-	groups = {oddly_breakable_by_hand = 1, cracky = 1, fluid_container = 1, tube = 1},
+	groups = {oddly_breakable_by_hand = 1, cracky = 1, fluid_container = 1, tubedevice = 1, tubedevice_receiver = 1},
 	fluid_buffers = {
 		output = {
 			capacity  = 8000,
diff --git a/elepower_farming/machines/harvester.lua b/elepower_farming/machines/harvester.lua
index becc336..5607fa3 100644
--- a/elepower_farming/machines/harvester.lua
+++ b/elepower_farming/machines/harvester.lua
@@ -178,6 +178,7 @@ ele.register_machine("elepower_farming:harvester", {
 		ele_user = 1,
 		cracky = 1,
 		tubedevice = 1,
+		tubedevice_receiver = 0,
 		fluid_container = 1,
 	},
 	fluid_buffers = {
diff --git a/elepower_machines/machines/bases/storage.lua b/elepower_machines/machines/bases/storage.lua
index 57e1256..31e132f 100644
--- a/elepower_machines/machines/bases/storage.lua
+++ b/elepower_machines/machines/bases/storage.lua
@@ -39,7 +39,8 @@ function elepm.register_storage(nodename, nodedef)
 	nodedef.groups["ele_machine"]  = 1
 	nodedef.groups["ele_storage"]  = 1
 	nodedef.groups["ele_provider"] = 1
-	nodedef.groups["tube"] = 1
+	nodedef.groups["tubedevice"] = 1
+	nodedef.groups["tubedevice_receiver"] = 1
 
 	nodedef.can_dig = can_dig
 
diff --git a/elepower_papi/machine.lua b/elepower_papi/machine.lua
index 7d509fe..7de2ff8 100644
--- a/elepower_papi/machine.lua
+++ b/elepower_papi/machine.lua
@@ -314,8 +314,8 @@ function ele.register_base_device(nodename, nodedef)
 	if pw and nodedef.groups and (nodedef.groups["tubedevice"] or nodedef.groups["tube"]) then
 		if nodedef['tube'] == false then
 			nodedef['tube'] = nil
-			nodedef.groups["tubedevice"] = 0
-			nodedef.groups["tube"] = 0
+			nodedef.groups["tubedevice"] = nil
+			nodedef.groups["tube"] = nil
 		elseif nodedef['tube'] then
 			for key,val in pairs(tube) do
 				if not nodedef['tube'][key] then
@@ -329,6 +329,11 @@ function ele.register_base_device(nodename, nodedef)
 		if nodedef.groups['tubedevice_receiver'] ~= 0 and nodedef['tube'] then
 			nodedef.groups.tubedevice_receiver = 1
 		end
+
+		if nodedef.groups.tube and not nodedef.groups.tubedevice then
+			nodedef.groups.tube = nil
+			nodedef.groups.tubedevice = 1
+		end
 	end
 
 	-- Node IO Support