diff --git a/internal/bbsim/api/services_handler.go b/internal/bbsim/api/services_handler.go
index 32b7794..e947a97 100644
--- a/internal/bbsim/api/services_handler.go
+++ b/internal/bbsim/api/services_handler.go
@@ -26,20 +26,28 @@
 
 func convertBBSimServiceToProtoService(s *devices.Service) *bbsim.Service {
 	return &bbsim.Service{
-		Name:          s.Name,
-		InternalState: s.InternalState.Current(),
-		HwAddress:     s.HwAddress.String(),
-		OnuSn:         s.UniPort.Onu.Sn(),
-		UniId:         s.UniPort.ID,
-		CTag:          int32(s.CTag),
-		STag:          int32(s.STag),
-		NeedsEapol:    s.NeedsEapol,
-		NeedsDhcp:     s.NeedsDhcp,
-		NeedsIgmp:     s.NeedsIgmp,
-		GemPort:       int32(s.GemPort),
-		EapolState:    s.EapolState.Current(),
-		DhcpState:     s.DHCPState.Current(),
-		IGMPState:     s.IGMPState.Current(),
+		Name:                s.Name,
+		InternalState:       s.InternalState.Current(),
+		HwAddress:           s.HwAddress.String(),
+		OnuSn:               s.UniPort.Onu.Sn(),
+		UniId:               s.UniPort.ID,
+		UniTagMatch:         int32(s.UniTagMatch),
+		CTag:                int32(s.CTag),
+		UsCTagPriority:      uint32(s.UsPonCTagPriority),
+		DsCTagPriority:      uint32(s.DsPonCTagPriority),
+		STag:                int32(s.STag),
+		UsSTagPriority:      uint32(s.UsPonSTagPriority),
+		DsSTagPriority:      uint32(s.DsPonSTagPriority),
+		NeedsEapol:          s.NeedsEapol,
+		NeedsDhcp:           s.NeedsDhcp,
+		NeedsIgmp:           s.NeedsIgmp,
+		NeedsPPPoE:          s.NeedsPPPoE,
+		ConfigureMacAddress: s.ConfigureMacAddress,
+		EnableMacLearning:   s.EnableMacLearning,
+		GemPort:             int32(s.GemPort),
+		EapolState:          s.EapolState.Current(),
+		DhcpState:           s.DHCPState.Current(),
+		IGMPState:           s.IGMPState.Current(),
 	}
 }
 
diff --git a/internal/bbsimctl/commands/services.go b/internal/bbsimctl/commands/services.go
index 1f3216a..e015791 100644
--- a/internal/bbsimctl/commands/services.go
+++ b/internal/bbsimctl/commands/services.go
@@ -19,16 +19,17 @@
 
 import (
 	"context"
+	"os"
+
 	"github.com/jessevdk/go-flags"
 	pb "github.com/opencord/bbsim/api/bbsim"
 	"github.com/opencord/bbsim/internal/bbsimctl/config"
 	"github.com/opencord/cordctl/pkg/format"
 	log "github.com/sirupsen/logrus"
-	"os"
 )
 
 const (
-	DEFAULT_SERVICE_HEADER_FORMAT = "table{{ .OnuSn }}\t{{ .UniId }}\t{{ .InternalState }}\t{{ .Name }}\t{{ .HwAddress }}\t{{ .STag }}\t{{ .CTag }}\t{{ .NeedsEapol }}\t{{ .NeedsDhcp }}\t{{ .NeedsIgmp }}\t{{ .GemPort }}\t{{ .EapolState }}\t{{ .DhcpState }}\t{{ .IGMPState }}"
+	DEFAULT_SERVICE_HEADER_FORMAT = "table{{ .OnuSn }}\t{{ .UniId }}\t{{ .InternalState }}\t{{ .Name }}\t{{ .HwAddress }}\t{{ .STag }}\t{{ .UsSTagPriority }}\t{{ .DsSTagPriority }}\t{{ .CTag }}\t{{ .UsCTagPriority }}\t{{ .DsCTagPriority }}\t{{ .UniTagMatch }}\t{{ .NeedsEapol }}\t{{ .NeedsDhcp }}\t{{ .NeedsIgmp }}\t{{ .NeedsPPPoE }}\t{{ .ConfigureMacAddress }}\t{{ .EnableMacLearning }}\t{{ .GemPort }}\t{{ .EapolState }}\t{{ .DhcpState }}\t{{ .IGMPState }}"
 )
 
 type ServiceList struct{}