diff --git a/internal/bbsim/dmiserver/dmi_events_mgmt.go b/internal/bbsim/dmiserver/dmi_events_mgmt.go
index 03bfd19..b217f60 100755
--- a/internal/bbsim/dmiserver/dmi_events_mgmt.go
+++ b/internal/bbsim/dmiserver/dmi_events_mgmt.go
@@ -18,6 +18,7 @@
 
 import (
 	"context"
+	"github.com/golang/protobuf/ptypes/empty"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -69,3 +70,8 @@
 		Status: dmi.Status_OK_STATUS,
 	}, nil
 }
+
+// Initiates the server streaming of the events
+func (dms *DmiAPIServer) StreamEvents(req *empty.Empty, srv dmi.NativeEventsManagementService_StreamEventsServer) error {
+	return status.Errorf(codes.Unimplemented, "rpc StreamEvents not implemented")
+}
diff --git a/internal/bbsim/dmiserver/dmi_hw_mgmt.go b/internal/bbsim/dmiserver/dmi_hw_mgmt.go
index 024f7c0..64450df 100755
--- a/internal/bbsim/dmiserver/dmi_hw_mgmt.go
+++ b/internal/bbsim/dmiserver/dmi_hw_mgmt.go
@@ -555,10 +555,15 @@
 	retResponse := dmi.ManagedDevicesResponse{}
 	//If our uuid is empty, we return empty list; else we fill details and return
 	if dms.uuid != "" {
-		root := dmi.ModifiableComponent{
-			Name: dms.deviceName,
-			Uri: &dmi.Uri{
-				Uri: dms.ipAddress,
+		root := dmi.ManagedDeviceInfo{
+			Info: &dmi.ModifiableComponent{
+				Name: dms.deviceName,
+				Uri: &dmi.Uri{
+					Uri: dms.ipAddress,
+				},
+			},
+			DeviceUuid: &dmi.Uuid{
+				Uuid: dms.uuid,
 			},
 		}
 
@@ -599,3 +604,13 @@
 		LogLevels: []*dmi.EntitiesLogLevel{},
 	}, nil
 }
+
+// Performs the heartbeat check
+func (dms *DmiAPIServer) HeartbeatCheck(context.Context, *empty.Empty) (*dmi.Heartbeat, error) {
+	return nil, status.Errorf(codes.Unimplemented, "rpc HeartbeatCheck not implemented")
+}
+
+// Performs the reboot of the device
+func (dms *DmiAPIServer) RebootDevice(context.Context, *dmi.RebootDeviceRequest) (*dmi.RebootDeviceResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "rpc RebootDevice not implemented")
+}
diff --git a/internal/bbsim/dmiserver/dmi_metrics_mgmt.go b/internal/bbsim/dmiserver/dmi_metrics_mgmt.go
index ea7c33e..0421d09 100755
--- a/internal/bbsim/dmiserver/dmi_metrics_mgmt.go
+++ b/internal/bbsim/dmiserver/dmi_metrics_mgmt.go
@@ -19,6 +19,7 @@
 import (
 	"context"
 
+	"github.com/golang/protobuf/ptypes/empty"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -101,3 +102,8 @@
 		Metric: metric,
 	}, nil
 }
+
+// Initiates the server streaming of the metrics
+func (dms *DmiAPIServer) StreamMetrics(req *empty.Empty, srv dmi.NativeMetricsManagementService_StreamMetricsServer) error {
+	return status.Errorf(codes.Unimplemented, "rpc StreamMetrics not implemented")
+}