diff --git a/client/grpc/grpc.go b/client/grpc/grpc.go
index 48215270..7f389012 100644
--- a/client/grpc/grpc.go
+++ b/client/grpc/grpc.go
@@ -16,8 +16,8 @@ import (
 	"github.com/micro/go-micro/codec"
 	"github.com/micro/go-micro/errors"
 	"github.com/micro/go-micro/metadata"
-	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/transport"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
diff --git a/client/options.go b/client/options.go
index 9f0c3f80..9f363d74 100644
--- a/client/options.go
+++ b/client/options.go
@@ -7,8 +7,8 @@ import (
 	"github.com/micro/go-micro/broker"
 	"github.com/micro/go-micro/client/selector"
 	"github.com/micro/go-micro/codec"
-	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/transport"
 )
 
 type Options struct {
diff --git a/client/rpc_client.go b/client/rpc_client.go
index 2b974289..ea63041e 100644
--- a/client/rpc_client.go
+++ b/client/rpc_client.go
@@ -15,8 +15,8 @@ import (
 	"github.com/micro/go-micro/codec"
 	"github.com/micro/go-micro/errors"
 	"github.com/micro/go-micro/metadata"
-	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/transport"
 )
 
 type rpcClient struct {
diff --git a/client/rpc_codec.go b/client/rpc_codec.go
index f3697b4b..6ff84a64 100644
--- a/client/rpc_codec.go
+++ b/client/rpc_codec.go
@@ -12,8 +12,8 @@ import (
 	"github.com/micro/go-micro/codec/proto"
 	"github.com/micro/go-micro/codec/protorpc"
 	"github.com/micro/go-micro/errors"
-	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/transport"
 )
 
 const (
diff --git a/client/selector/router/router.go b/client/selector/router/router.go
index 14146fba..ada33595 100644
--- a/client/selector/router/router.go
+++ b/client/selector/router/router.go
@@ -44,7 +44,7 @@ type routerKey struct{}
 func (r *routerSelector) getRoutes(service string) ([]table.Route, error) {
 	if !r.remote {
 		// lookup router for routes for the service
-		return r.r.Table().Lookup(table.NewQuery(
+		return r.r.Lookup(table.NewQuery(
 			table.QueryService(service),
 		))
 	}
diff --git a/config/cmd/options.go b/config/cmd/options.go
index b4917c27..1f221f35 100644
--- a/config/cmd/options.go
+++ b/config/cmd/options.go
@@ -6,9 +6,9 @@ import (
 	"github.com/micro/go-micro/broker"
 	"github.com/micro/go-micro/client"
 	"github.com/micro/go-micro/client/selector"
-	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
 	"github.com/micro/go-micro/server"
+	"github.com/micro/go-micro/transport"
 )
 
 type Options struct {
diff --git a/network/proxy/mucp/mucp.go b/network/proxy/mucp/mucp.go
index 05880fc9..22f04bc9 100644
--- a/network/proxy/mucp/mucp.go
+++ b/network/proxy/mucp/mucp.go
@@ -106,7 +106,7 @@ func (p *Proxy) getRoute(service string) ([]string, error) {
 	// in future we might set a default gateway
 	if p.Router != nil {
 		// lookup the router
-		routes, err := p.Router.Table().Lookup(
+		routes, err := p.Router.Lookup(
 			table.NewQuery(table.QueryService(service)),
 		)
 		if err != nil {
diff --git a/options.go b/options.go
index 1b8a5724..d566a353 100644
--- a/options.go
+++ b/options.go
@@ -9,9 +9,9 @@ import (
 	"github.com/micro/go-micro/client"
 	"github.com/micro/go-micro/client/selector"
 	"github.com/micro/go-micro/config/cmd"
-	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
 	"github.com/micro/go-micro/server"
+	"github.com/micro/go-micro/transport"
 )
 
 type Options struct {
diff --git a/server/grpc/options.go b/server/grpc/options.go
index 3c9d125f..65d82fcc 100644
--- a/server/grpc/options.go
+++ b/server/grpc/options.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/micro/go-micro/broker"
 	"github.com/micro/go-micro/codec"
-	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
 	"github.com/micro/go-micro/server"
 	"github.com/micro/go-micro/server/debug"
+	"github.com/micro/go-micro/transport"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )
diff --git a/server/options.go b/server/options.go
index 018958a2..15de9b83 100644
--- a/server/options.go
+++ b/server/options.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/micro/go-micro/broker"
 	"github.com/micro/go-micro/codec"
-	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
 	"github.com/micro/go-micro/server/debug"
+	"github.com/micro/go-micro/transport"
 )
 
 type Options struct {
diff --git a/server/rpc_server.go b/server/rpc_server.go
index 284d499d..8bb7b547 100644
--- a/server/rpc_server.go
+++ b/server/rpc_server.go
@@ -13,8 +13,8 @@ import (
 	"github.com/micro/go-micro/broker"
 	"github.com/micro/go-micro/codec"
 	"github.com/micro/go-micro/metadata"
-	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/transport"
 	"github.com/micro/go-micro/util/addr"
 	log "github.com/micro/go-micro/util/log"
 )