diff --git a/adapters/simulated_olt/adaptercore/device_handler.go b/adapters/simulated_olt/adaptercore/device_handler.go
index 3e2d01d..b83f265 100644
--- a/adapters/simulated_olt/adaptercore/device_handler.go
+++ b/adapters/simulated_olt/adaptercore/device_handler.go
@@ -150,7 +150,10 @@
 			cloned.Id,
 			1,
 			"simulated_onu",
-			initialUniPortNo+i)
+			initialUniPortNo+i,
+			"simulated_onu",
+			com.GetRandomSerialNumber(),
+			int64(i))
 	}
 }
 
diff --git a/adapters/simulated_onu/adaptercore/device_handler.go b/adapters/simulated_onu/adaptercore/device_handler.go
index 51a0667..4404643 100644
--- a/adapters/simulated_onu/adaptercore/device_handler.go
+++ b/adapters/simulated_onu/adaptercore/device_handler.go
@@ -96,7 +96,7 @@
 	cloned.Root = false
 	cloned.Vendor = "simulators"
 	cloned.Model = "go-simulators"
-	cloned.SerialNumber = com.GetRandomSerialNumber()
+	//cloned.SerialNumber = com.GetRandomSerialNumber()
 	cloned.MacAddress = strings.ToUpper(com.GetRandomMacAddress())
 
 	// Synchronous call to update device - this method is run in its own go routine