diff --git a/catalog/controller.go b/catalog/controller.go
index 2529310..82b530a 100644
--- a/catalog/controller.go
+++ b/catalog/controller.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/linksmart/service-catalog/v2/utils"
+	"github.com/linksmart/service-catalog/v3/utils"
 	uuid "github.com/satori/go.uuid"
 )
 
diff --git a/catalog/controller_test.go b/catalog/controller_test.go
index aa188f2..b27bd31 100644
--- a/catalog/controller_test.go
+++ b/catalog/controller_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/linksmart/service-catalog/v2/utils"
+	"github.com/linksmart/service-catalog/v3/utils"
 	uuid "github.com/satori/go.uuid"
 )
 
diff --git a/catalog/http.go b/catalog/http.go
index 2c2ed92..1cbf6b1 100644
--- a/catalog/http.go
+++ b/catalog/http.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/linksmart/service-catalog/v2/utils"
+	"github.com/linksmart/service-catalog/v3/utils"
 )
 
 type HttpAPI struct {
diff --git a/catalog/http_test.go b/catalog/http_test.go
index fc1a3df..f698707 100644
--- a/catalog/http_test.go
+++ b/catalog/http_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 
 	"github.com/gorilla/mux"
-	"github.com/linksmart/service-catalog/v2/utils"
+	"github.com/linksmart/service-catalog/v3/utils"
 	uuid "github.com/satori/go.uuid"
 )
 
diff --git a/catalog/ldbstorage.go b/catalog/ldbstorage.go
index 6075dc5..d788ae9 100644
--- a/catalog/ldbstorage.go
+++ b/catalog/ldbstorage.go
@@ -8,8 +8,7 @@ import (
 	"net/url"
 	"sync"
 
-	"github.com/linksmart/service-catalog/v2/utils"
-
+	"github.com/linksmart/service-catalog/v3/utils"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 )
diff --git a/catalog/memstorage.go b/catalog/memstorage.go
index a0b1a6a..cd5db57 100644
--- a/catalog/memstorage.go
+++ b/catalog/memstorage.go
@@ -6,9 +6,8 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/linksmart/service-catalog/v2/utils"
-
 	avl "github.com/ancientlore/go-avltree"
+	"github.com/linksmart/service-catalog/v3/utils"
 )
 
 // In-memory storage
diff --git a/client/examples/http_client/main.go b/client/examples/http_client/main.go
index 8bf4bef..5f2f5a9 100644
--- a/client/examples/http_client/main.go
+++ b/client/examples/http_client/main.go
@@ -4,8 +4,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/linksmart/service-catalog/v2/catalog"
-	"github.com/linksmart/service-catalog/v2/client"
+	"github.com/linksmart/service-catalog/v3/catalog"
+	"github.com/linksmart/service-catalog/v3/client"
 )
 
 func main() {
diff --git a/client/examples/mqtt_client/main.go b/client/examples/mqtt_client/main.go
index 57099fd..35ace4e 100644
--- a/client/examples/mqtt_client/main.go
+++ b/client/examples/mqtt_client/main.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	paho "github.com/eclipse/paho.mqtt.golang"
-	"github.com/linksmart/service-catalog/v2/catalog"
+	"github.com/linksmart/service-catalog/v3/catalog"
 )
 
 func main() {
diff --git a/client/http.go b/client/http.go
index afa87bb..8d0d45c 100644
--- a/client/http.go
+++ b/client/http.go
@@ -10,8 +10,8 @@ import (
 	"net/url"
 
 	"github.com/linksmart/go-sec/auth/obtainer"
-	"github.com/linksmart/service-catalog/v2/catalog"
-	"github.com/linksmart/service-catalog/v2/utils"
+	"github.com/linksmart/service-catalog/v3/catalog"
+	"github.com/linksmart/service-catalog/v3/utils"
 )
 
 // HTTPClient is the http client struct
diff --git a/client/registrator.go b/client/registrator.go
index f34046f..75af125 100644
--- a/client/registrator.go
+++ b/client/registrator.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/linksmart/go-sec/auth/obtainer"
-	"github.com/linksmart/service-catalog/v2/catalog"
+	"github.com/linksmart/service-catalog/v3/catalog"
 )
 
 // RegisterService registers service into a catalog
diff --git a/config.go b/config.go
index deb4e3b..b15572c 100644
--- a/config.go
+++ b/config.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/kelseyhightower/envconfig"
 	"github.com/linksmart/go-sec/authz"
-	"github.com/linksmart/service-catalog/v2/catalog"
+	"github.com/linksmart/service-catalog/v3/catalog"
 )
 
 type Config struct {
diff --git a/go.mod b/go.mod
index 835c158..fb43717 100644
--- a/go.mod
+++ b/go.mod
@@ -1,9 +1,9 @@
-module github.com/linksmart/service-catalog/v2
+module github.com/linksmart/service-catalog/v3
 
-go 1.12
+go 1.13
 
 require (
-	github.com/ancientlore/go-avltree v0.0.0-20180928192319-da83409fdfb7
+	github.com/ancientlore/go-avltree v1.0.1
 	github.com/eclipse/paho.mqtt.golang v1.2.0
 	github.com/farshidtz/elog v1.0.1
 	github.com/farshidtz/mqtt-match v1.0.1
@@ -12,11 +12,11 @@ require (
 	github.com/justinas/alice v0.0.0-20160512134231-052b8b6c18ed
 	github.com/kelseyhightower/envconfig v1.3.0
 	github.com/linksmart/go-sec v1.0.1
-	github.com/miekg/dns v0.0.0-20170818131442-e4205768578d // indirect
+	github.com/miekg/dns v1.1.27 // indirect
 	github.com/oleksandr/bonjour v0.0.0-20160508152359-5dcf00d8b228
 	github.com/rs/cors v1.7.0
 	github.com/satori/go.uuid v1.1.0
-	github.com/stretchr/testify v1.3.0 // indirect
+	github.com/stretchr/testify v1.5.1 // indirect
 	github.com/syndtr/goleveldb v1.0.0
 	github.com/urfave/negroni v1.0.0
 )
diff --git a/go.sum b/go.sum
index 00b9cd8..aa386ee 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,8 @@
 github.com/ancientlore/go-avltree v0.0.0-20180928192319-da83409fdfb7 h1:oIquyipmpCIO2I2+4MrsZ+PgGYUeR0HpIUrQxrrKiRU=
 github.com/ancientlore/go-avltree v0.0.0-20180928192319-da83409fdfb7/go.mod h1:nfJ32Li6TWi3iVi9M3XF19FNqdfTlmoI87CPVgtgqoc=
+github.com/ancientlore/go-avltree v1.0.1 h1:4XsGK6rkg1rjCTZoQbc09It5tmgMGCcFSYCVRwV99KU=
+github.com/ancientlore/go-avltree v1.0.1/go.mod h1:nfJ32Li6TWi3iVi9M3XF19FNqdfTlmoI87CPVgtgqoc=
+github.com/codegangsta/negroni v0.2.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.0.0+incompatible h1:nfVqwkkhaRUethVJaQf5TUFdFr3YUF4lJBTf/F2XwVI=
@@ -32,8 +35,12 @@ github.com/kelseyhightower/envconfig v1.3.0 h1:IvRS4f2VcIQy6j4ORGIf9145T/AsUB+oY
 github.com/kelseyhightower/envconfig v1.3.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
 github.com/linksmart/go-sec v1.0.1 h1:UNeRj81/KHCy4hkFcZn7x5N/nM+uNxe+xsLBQzNF7kg=
 github.com/linksmart/go-sec v1.0.1/go.mod h1:bTksBzP6fCEwIM43z8m3jSRa4YIAWdUwMBYjcoftm1c=
+github.com/linksmart/service-catalog/v2 v2.4.1 h1:/gtc/9AvLGbabYc0wsfGRhqpS2s68v9wH7WTQbGLG+c=
+github.com/linksmart/service-catalog/v2 v2.4.1/go.mod h1:aIfziWy3rusDlaoEIeoML6XV68RVFdNm+i58X9inXcY=
 github.com/miekg/dns v0.0.0-20170818131442-e4205768578d h1:M1nGptTlM6l6aT5MUYA5XExwSjnIPHA+xEOWobbMU6g=
 github.com/miekg/dns v0.0.0-20170818131442-e4205768578d/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM=
+github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/oleksandr/bonjour v0.0.0-20160508152359-5dcf00d8b228 h1:Cvfd2dOlXIPTeEkOT/h8PyK4phBngOM4at9/jlgy7d4=
 github.com/oleksandr/bonjour v0.0.0-20160508152359-5dcf00d8b228/go.mod h1:MGuVJ1+5TX1SCoO2Sx0eAnjpdRytYla2uC1YIZfkC9c=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -50,18 +57,36 @@ github.com/satori/go.uuid v1.1.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
@@ -70,3 +95,5 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/init.go b/init.go
index 719a56f..3a514f7 100644
--- a/init.go
+++ b/init.go
@@ -4,7 +4,7 @@ package main
 
 import (
 	"github.com/farshidtz/elog"
-	"github.com/linksmart/service-catalog/v2/catalog"
+	"github.com/linksmart/service-catalog/v3/catalog"
 )
 
 var logger *elog.Logger
diff --git a/integration-test/mqtt_test.go b/integration-test/mqtt_test.go
index 7632a07..5169491 100644
--- a/integration-test/mqtt_test.go
+++ b/integration-test/mqtt_test.go
@@ -4,15 +4,13 @@ import (
 	"encoding/json"
 	"log"
 	"os"
+	"strings"
 	"testing"
 	"time"
 
-	"github.com/linksmart/service-catalog/v2/client"
-
-	"strings"
-
 	paho "github.com/eclipse/paho.mqtt.golang"
-	"github.com/linksmart/service-catalog/v2/catalog"
+	"github.com/linksmart/service-catalog/v3/catalog"
+	"github.com/linksmart/service-catalog/v3/client"
 	uuid "github.com/satori/go.uuid"
 )
 
diff --git a/main.go b/main.go
index 26e8b31..4cc35c9 100644
--- a/main.go
+++ b/main.go
@@ -16,7 +16,7 @@ import (
 	"github.com/justinas/alice"
 	_ "github.com/linksmart/go-sec/auth/keycloak/validator"
 	"github.com/linksmart/go-sec/auth/validator"
-	"github.com/linksmart/service-catalog/v2/catalog"
+	"github.com/linksmart/service-catalog/v3/catalog"
 	"github.com/oleksandr/bonjour"
 	"github.com/rs/cors"
 	uuid "github.com/satori/go.uuid"
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 25ed940..93a47a7 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -25,10 +25,16 @@ github.com/linksmart/go-sec/auth/keycloak/validator
 github.com/linksmart/go-sec/auth/obtainer
 github.com/linksmart/go-sec/auth/validator
 github.com/linksmart/go-sec/authz
-# github.com/miekg/dns v0.0.0-20170818131442-e4205768578d
+# github.com/linksmart/service-catalog/v2 v2.4.1
+github.com/linksmart/service-catalog/v2/catalog
+github.com/linksmart/service-catalog/v2/client
+github.com/linksmart/service-catalog/v2/utils
+# github.com/miekg/dns v1.1.27
 github.com/miekg/dns
 # github.com/oleksandr/bonjour v0.0.0-20160508152359-5dcf00d8b228
 github.com/oleksandr/bonjour
+# github.com/rs/cors v1.7.0
+github.com/rs/cors
 # github.com/satori/go.uuid v1.1.0
 github.com/satori/go.uuid
 # github.com/syndtr/goleveldb v1.0.0
@@ -46,7 +52,10 @@ github.com/syndtr/goleveldb/leveldb/table
 github.com/syndtr/goleveldb/leveldb/util
 # github.com/urfave/negroni v1.0.0
 github.com/urfave/negroni
-# golang.org/x/net v0.0.0-20180906233101-161cd47e91fd
+# golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
+golang.org/x/crypto/ed25519
+golang.org/x/crypto/ed25519/internal/edwards25519
+# golang.org/x/net v0.0.0-20190923162816-aa69164e4478
 golang.org/x/net/bpf
 golang.org/x/net/internal/iana
 golang.org/x/net/internal/socket
@@ -55,3 +64,6 @@ golang.org/x/net/ipv4
 golang.org/x/net/ipv6
 golang.org/x/net/proxy
 golang.org/x/net/websocket
+# golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe
+golang.org/x/sys/unix
+golang.org/x/sys/windows