diff --git a/README.md b/README.md
index b165633..c925552 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/gol4ng/httpware/v2"
+	"github.com/gol4ng/httpware/v3"
 	"github.com/gol4ng/logger"
 	"github.com/gol4ng/logger-http/tripperware"
 	"github.com/gol4ng/logger/formatter"
@@ -79,7 +79,7 @@ package main
      	"net/http"
      	"os"
      
-     	"github.com/gol4ng/httpware/v2"
+     	"github.com/gol4ng/httpware/v3"
      	"github.com/gol4ng/logger"
      	"github.com/gol4ng/logger-http/middleware"
      	"github.com/gol4ng/logger/formatter"
diff --git a/go.mod b/go.mod
index 7157f47..7760587 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@ module github.com/gol4ng/logger-http
 go 1.13
 
 require (
-	github.com/gol4ng/httpware/v2 v2.1.1
+	github.com/gol4ng/httpware/v3 v3.0.0
 	github.com/gol4ng/logger v0.5.3
-	github.com/golang/mock v1.4.0
 	github.com/stretchr/testify v1.4.0
+	golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a // indirect
 )
diff --git a/go.sum b/go.sum
index 24ac772..7c3d19f 100644
--- a/go.sum
+++ b/go.sum
@@ -13,12 +13,10 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gol4ng/httpware/v2 v2.1.1 h1:8xd4iN+6e/xjBSy8jjF2Vm8/PvxswJznu8GdaNu+vs8=
-github.com/gol4ng/httpware/v2 v2.1.1/go.mod h1:SIOrsksHg+ydQWikEj5KUVANB4lmwB8c5/NIBtdVzFM=
+github.com/gol4ng/httpware/v3 v3.0.0 h1:kubsxU1GAQaipgnaYZqvB9wtjvXDcP4evbEhSANd7fI=
+github.com/gol4ng/httpware/v3 v3.0.0/go.mod h1:qGWpQuhPcx3ej/fADomrfv96eVyIQyB6NfVaX4Gi5fs=
 github.com/gol4ng/logger v0.5.3 h1:gX9fX5Ke1c9ldyIkbHBVux3EJ73FsPsmzWnXT8LEsTo=
 github.com/gol4ng/logger v0.5.3/go.mod h1:RU2axpKm//DmUGqQNIhXmUBHKeLdtWarxu8bSV+5b4Y=
-github.com/golang/mock v1.4.0 h1:Rd1kQnQu0Hq3qvJppYSG0HtP+f5LPPUiDswTLiEegLg=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -64,19 +62,13 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5 h1:mzjBh+S5frKOsOBobWIMAbXavqjmgO17k/2puhcFR94=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 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=
@@ -87,5 +79,3 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/middleware/correlation_id.go b/middleware/correlation_id.go
index 1c5ff8a..6b2d5bf 100644
--- a/middleware/correlation_id.go
+++ b/middleware/correlation_id.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/gol4ng/httpware/v2"
-	"github.com/gol4ng/httpware/v2/correlation_id"
-	http_middleware "github.com/gol4ng/httpware/v2/middleware"
+	"github.com/gol4ng/httpware/v3"
+	"github.com/gol4ng/httpware/v3/correlation_id"
+	http_middleware "github.com/gol4ng/httpware/v3/middleware"
 	"github.com/gol4ng/logger"
 	"github.com/gol4ng/logger/middleware"
 
diff --git a/middleware/correlation_id_test.go b/middleware/correlation_id_test.go
index 50f22bb..018772c 100644
--- a/middleware/correlation_id_test.go
+++ b/middleware/correlation_id_test.go
@@ -11,8 +11,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/gol4ng/httpware/v2"
-	"github.com/gol4ng/httpware/v2/correlation_id"
+	"github.com/gol4ng/httpware/v3"
+	"github.com/gol4ng/httpware/v3/correlation_id"
 	"github.com/gol4ng/logger"
 	"github.com/gol4ng/logger/formatter"
 	"github.com/gol4ng/logger/handler"
diff --git a/middleware/inject_logger.go b/middleware/inject_logger.go
index 4fb8ac4..e9baf30 100644
--- a/middleware/inject_logger.go
+++ b/middleware/inject_logger.go
@@ -3,7 +3,7 @@ package middleware
 import (
 	"net/http"
 
-	"github.com/gol4ng/httpware/v2"
+	"github.com/gol4ng/httpware/v3"
 	"github.com/gol4ng/logger"
 )
 
diff --git a/middleware/inject_logger_test.go b/middleware/inject_logger_test.go
index 7e2cfc3..6ee7782 100644
--- a/middleware/inject_logger_test.go
+++ b/middleware/inject_logger_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gol4ng/httpware/v2"
+	"github.com/gol4ng/httpware/v3"
 	"github.com/gol4ng/logger"
 	"github.com/stretchr/testify/assert"
 
diff --git a/middleware/logger.go b/middleware/logger.go
index 14d41ea..2434197 100644
--- a/middleware/logger.go
+++ b/middleware/logger.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/gol4ng/httpware/v2"
-	http_middleware "github.com/gol4ng/httpware/v2/middleware"
+	"github.com/gol4ng/httpware/v3"
+	http_middleware "github.com/gol4ng/httpware/v3/middleware"
 	"github.com/gol4ng/logger"
 
 	"github.com/gol4ng/logger-http"
diff --git a/tripperware/correlation_id.go b/tripperware/correlation_id.go
index 2d00832..9ebbd6c 100644
--- a/tripperware/correlation_id.go
+++ b/tripperware/correlation_id.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/gol4ng/httpware/v2"
-	"github.com/gol4ng/httpware/v2/correlation_id"
-	http_tripperware "github.com/gol4ng/httpware/v2/tripperware"
+	"github.com/gol4ng/httpware/v3"
+	"github.com/gol4ng/httpware/v3/correlation_id"
+	http_tripperware "github.com/gol4ng/httpware/v3/tripperware"
 	"github.com/gol4ng/logger"
 	"github.com/gol4ng/logger/middleware"
 
diff --git a/tripperware/correlation_id_test.go b/tripperware/correlation_id_test.go
index 3e6644a..12932e3 100644
--- a/tripperware/correlation_id_test.go
+++ b/tripperware/correlation_id_test.go
@@ -10,8 +10,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/gol4ng/httpware/v2"
-	"github.com/gol4ng/httpware/v2/correlation_id"
+	"github.com/gol4ng/httpware/v3"
+	"github.com/gol4ng/httpware/v3/correlation_id"
 	"github.com/gol4ng/logger"
 	testing_logger "github.com/gol4ng/logger/testing"
 	"github.com/stretchr/testify/assert"
diff --git a/tripperware/inject_logger.go b/tripperware/inject_logger.go
index 9eae52a..5d6455f 100644
--- a/tripperware/inject_logger.go
+++ b/tripperware/inject_logger.go
@@ -3,7 +3,7 @@ package tripperware
 import (
 	"net/http"
 
-	"github.com/gol4ng/httpware/v2"
+	"github.com/gol4ng/httpware/v3"
 	"github.com/gol4ng/logger"
 )
 
diff --git a/tripperware/inject_logger_test.go b/tripperware/inject_logger_test.go
index c48078b..2d2e037 100644
--- a/tripperware/inject_logger_test.go
+++ b/tripperware/inject_logger_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/gol4ng/httpware/v2"
+	"github.com/gol4ng/httpware/v3"
 	"github.com/gol4ng/logger"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
diff --git a/tripperware/logger.go b/tripperware/logger.go
index aa8ae2e..67f8b20 100644
--- a/tripperware/logger.go
+++ b/tripperware/logger.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/gol4ng/httpware/v2"
+	"github.com/gol4ng/httpware/v3"
 	"github.com/gol4ng/logger"
 
 	"github.com/gol4ng/logger-http"
diff --git a/tripperware/logger_test.go b/tripperware/logger_test.go
index 98e9a9d..e8ec81e 100644
--- a/tripperware/logger_test.go
+++ b/tripperware/logger_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gol4ng/httpware/v2"
+	"github.com/gol4ng/httpware/v3"
 	"github.com/gol4ng/logger"
 	testing_logger "github.com/gol4ng/logger/testing"
 	"github.com/stretchr/testify/assert"