diff --git a/adaptercore/openolt_flowmgr.go b/adaptercore/openolt_flowmgr.go
index 8ee2a11..e3f0ccb 100644
--- a/adaptercore/openolt_flowmgr.go
+++ b/adaptercore/openolt_flowmgr.go
@@ -135,8 +135,6 @@
 	VlanPCPMask = 0xFF
 	//VlanvIDMask constant
 	VlanvIDMask = 0xFFF
-	//MaxPonPorts constant
-	MaxPonPorts = 16
 	//IntfID constant
 	IntfID = "intfId"
 	//OnuID constant
@@ -168,7 +166,7 @@
 
 //OpenOltFlowMgr creates the Structure of OpenOltFlowMgr obj
 type OpenOltFlowMgr struct {
-	techprofile        []tp.TechProfileIf
+	techprofile        map[uint32]tp.TechProfileIf
 	deviceHandler      *DeviceHandler
 	resourceMgr        *rsrcMgr.OpenOltResourceMgr
 	onuIdsLock         sync.RWMutex
@@ -187,7 +185,7 @@
 
 	flowMgr.deviceHandler = dh
 	flowMgr.resourceMgr = rMgr
-	flowMgr.techprofile = make([]tp.TechProfileIf, MaxPonPorts)
+	flowMgr.techprofile = make(map[uint32]tp.TechProfileIf)
 	if err = flowMgr.populateTechProfilePerPonPort(); err != nil {
 		log.Error("Error while populating tech profile mgr\n")
 		return nil