diff --git a/go.mod b/go.mod
index 9bdd3bdf..15ae1a3b 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/edwarnicke/serialize v1.0.7
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/networkservicemesh/api v0.0.0-20201204203731-4294f67deaa4
-	github.com/networkservicemesh/sdk v0.0.0-20201209081426-89944c40ef4d
+	github.com/networkservicemesh/sdk v0.0.0-20201228071212-4e3006826a6a
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/sirupsen/logrus v1.7.0
 	github.com/spiffe/go-spiffe/v2 v2.0.0-beta.2
diff --git a/go.sum b/go.sum
index 6e05fe05..35c7ae24 100644
--- a/go.sum
+++ b/go.sum
@@ -306,8 +306,8 @@ github.com/nats-io/stan.go v0.6.0/go.mod h1:eIcD5bi3pqbHT/xIIvXMwvzXYElgouBvaVRf
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
 github.com/networkservicemesh/api v0.0.0-20201204203731-4294f67deaa4 h1:2HsHa5QtuMh5mjIqLWkiQx2cxFZMiYtQCvM8N7LjFVU=
 github.com/networkservicemesh/api v0.0.0-20201204203731-4294f67deaa4/go.mod h1:qvxdY1Zt4QTtiG+uH1XmjpegeHjlt5Jj4A8iK55iJPI=
-github.com/networkservicemesh/sdk v0.0.0-20201209081426-89944c40ef4d h1:sUVW+0ojn4+kY+Mw0MgZoIsLHqzyQBRExvQhJdlrYdM=
-github.com/networkservicemesh/sdk v0.0.0-20201209081426-89944c40ef4d/go.mod h1:Mh4ETI2Sw9MJ4VSdTyvRYCP1SBtFy7EeRwxfJW7MvQ8=
+github.com/networkservicemesh/sdk v0.0.0-20201228071212-4e3006826a6a h1:LxbTguiX+B5x3y7vKpsPe3GLIZ2Nsbvm05rzEZFWC8s=
+github.com/networkservicemesh/sdk v0.0.0-20201228071212-4e3006826a6a/go.mod h1:Mh4ETI2Sw9MJ4VSdTyvRYCP1SBtFy7EeRwxfJW7MvQ8=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nishanths/exhaustive v0.0.0-20200811152831-6cf413ae40e0/go.mod h1:wBEpHwM2OdmeNpdCvRPUlkEbBuaFmcK4Wv8Q7FuGW3c=
diff --git a/internal/imports/imports.go b/internal/imports/imports.go
index d2f994a3..1221ff1a 100644
--- a/internal/imports/imports.go
+++ b/internal/imports/imports.go
@@ -48,8 +48,8 @@ import (
 	_ "github.com/networkservicemesh/sdk/pkg/networkservice/common/setextracontext"
 	_ "github.com/networkservicemesh/sdk/pkg/networkservice/core/adapters"
 	_ "github.com/networkservicemesh/sdk/pkg/registry/common/interpose"
+	_ "github.com/networkservicemesh/sdk/pkg/registry/common/memory"
 	_ "github.com/networkservicemesh/sdk/pkg/registry/core/chain"
-	_ "github.com/networkservicemesh/sdk/pkg/registry/memory"
 	_ "github.com/networkservicemesh/sdk/pkg/tools/addressof"
 	_ "github.com/networkservicemesh/sdk/pkg/tools/callback"
 	_ "github.com/networkservicemesh/sdk/pkg/tools/debug"
diff --git a/test/mock/registry/server.go b/test/mock/registry/server.go
index 43a8d169..181a9b4d 100644
--- a/test/mock/registry/server.go
+++ b/test/mock/registry/server.go
@@ -31,8 +31,8 @@ import (
 
 	"github.com/sirupsen/logrus"
 
+	"github.com/networkservicemesh/sdk/pkg/registry/common/memory"
 	"github.com/networkservicemesh/sdk/pkg/registry/core/chain"
-	"github.com/networkservicemesh/sdk/pkg/registry/memory"
 
 	"google.golang.org/grpc"