diff --git a/internal/pkg/common/interfaces.go b/internal/pkg/common/interfaces.go
index e1ef21f..39b37ba 100755
--- a/internal/pkg/common/interfaces.go
+++ b/internal/pkg/common/interfaces.go
@@ -21,6 +21,7 @@
 	"context"
 	"time"
 
+	me "github.com/opencord/omci-lib-go/v2/generated"
 	"github.com/opencord/voltha-lib-go/v7/pkg/db"
 	"github.com/opencord/voltha-lib-go/v7/pkg/events/eventif"
 	"github.com/opencord/voltha-openonu-adapter-go/internal/pkg/devdb"
@@ -138,10 +139,7 @@
 	IncrementMibDataSync(context.Context)
 
 	GetActiveImageMeID(context.Context) (uint16, error)
-	LockMutexOnuSwImageIndications()
-	UnlockMutexOnuSwImageIndications()
-	GetOnuSwImageIndications() SswImageIndications
-	SetOnuSwImageIndications(SswImageIndications)
+	HandleSwImageIndications(context.Context, uint16, me.AttributeValueMap)
 	GetPersActiveSwVersion() string
 	SetPersActiveSwVersion(string)
 	GetActiveImageVersion(context.Context) string