diff --git a/edge/edge_test.go b/edge/edge_test.go
index 1127d7d4..ab0eb7e6 100644
--- a/edge/edge_test.go
+++ b/edge/edge_test.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/ronaksoft/rony"
 	"github.com/ronaksoft/rony/edge"
+	"github.com/ronaksoft/rony/edgetest"
 	dummyGateway "github.com/ronaksoft/rony/internal/gateway/dummy"
 	"github.com/ronaksoft/rony/internal/testEnv"
 	"github.com/ronaksoft/rony/internal/testEnv/pb/service"
@@ -26,13 +27,21 @@ import (
    Copyright Ronak Software Group 2020
 */
 
+var (
+	s *edgetest.Server
+)
+
+func TestMain(m *testing.M) {
+	s = testEnv.TestServer("TestServer")
+	service.RegisterSample(&service.Sample{ServerID: "TestServer"}, s.RealEdge())
+	s.Start()
+	defer s.Shutdown()
+
+	m.Run()
+}
+
 func TestWithTestGateway(t *testing.T) {
 	Convey("EdgeTest Gateway", t, func(c C) {
-		s := testEnv.TestServer("TestServer")
-		service.RegisterSample(&service.Sample{ServerID: "TestServer"}, s.RealEdge())
-		s.Start()
-		defer s.Shutdown()
-
 		err := s.RPC().
 			Request(service.C_SampleEcho, &service.EchoRequest{
 				Int:       100,
@@ -57,7 +66,6 @@ func TestWithTestGateway(t *testing.T) {
 func TestRestProxy(t *testing.T) {
 	Convey("Edge With RestProxy", t, func(c C) {
 		Convey("Manual", func(c C) {
-			s := testEnv.TestServer("TestServer")
 			s.RealEdge().SetRestProxy(
 				rony.MethodGet, "/x/:value",
 				edge.NewRestProxy(
@@ -96,11 +104,8 @@ func TestRestProxy(t *testing.T) {
 			c.So(err, ShouldBeNil)
 		})
 		Convey("JSON", func(c C) {
-			s := testEnv.TestServer("TestServer")
 			s.RealEdge().SetRestProxy(rony.MethodPost, "/echo", service.EchoRest)
 			service.RegisterSample(&service.Sample{ServerID: "TestServer"}, s.RealEdge())
-			s.Start()
-			defer s.Shutdown()
 
 			req := &service.EchoRequest{
 				Int:        tools.RandomInt64(0),
@@ -125,11 +130,8 @@ func TestRestProxy(t *testing.T) {
 			c.So(err, ShouldBeNil)
 		})
 		Convey("JSON and Binding", func(c C) {
-			s := testEnv.TestServer("TestServer")
 			s.RealEdge().SetRestProxy(rony.MethodGet, "/echo/:value/:ts", service.EchoRestBinding)
 			service.RegisterSample(&service.Sample{ServerID: "TestServer"}, s.RealEdge())
-			s.Start()
-			defer s.Shutdown()
 
 			value := tools.RandomInt64(0)
 			ts := tools.NanoTime()
diff --git a/example/echo/rpc/sample.rony.go b/example/echo/rpc/sample.rony.go
index 3dfa7348..9e66cc9d 100644
--- a/example/echo/rpc/sample.rony.go
+++ b/example/echo/rpc/sample.rony.go
@@ -1,6 +1,6 @@
 // Code generated by Rony's protoc plugin; DO NOT EDIT.
 // ProtoC ver. v3.17.3
-// Rony ver. v0.12.38
+// Rony ver. v0.12.39
 // Source: sample.proto
 
 package service
diff --git a/example/redirect/rpc/sample.rony.go b/example/redirect/rpc/sample.rony.go
index c38313e0..30c835eb 100644
--- a/example/redirect/rpc/sample.rony.go
+++ b/example/redirect/rpc/sample.rony.go
@@ -1,6 +1,6 @@
 // Code generated by Rony's protoc plugin; DO NOT EDIT.
 // ProtoC ver. v3.17.3
-// Rony ver. v0.12.38
+// Rony ver. v0.12.39
 // Source: sample.proto
 
 package rpc
diff --git a/example/task_manager/modules/auth/model.rony.go b/example/task_manager/modules/auth/model.rony.go
index e6ce3852..1e9b315b 100644
--- a/example/task_manager/modules/auth/model.rony.go
+++ b/example/task_manager/modules/auth/model.rony.go
@@ -1,6 +1,6 @@
 // Code generated by Rony's protoc plugin; DO NOT EDIT.
 // ProtoC ver. v3.17.3
-// Rony ver. v0.12.38
+// Rony ver. v0.12.39
 // Source: model.proto
 
 package auth
diff --git a/example/task_manager/modules/auth/rpc.rony.go b/example/task_manager/modules/auth/rpc.rony.go
index 33ee314f..118fb198 100644
--- a/example/task_manager/modules/auth/rpc.rony.go
+++ b/example/task_manager/modules/auth/rpc.rony.go
@@ -1,6 +1,6 @@
 // Code generated by Rony's protoc plugin; DO NOT EDIT.
 // ProtoC ver. v3.17.3
-// Rony ver. v0.12.38
+// Rony ver. v0.12.39
 // Source: rpc.proto
 
 package auth
diff --git a/example/task_manager/modules/task/model.rony.go b/example/task_manager/modules/task/model.rony.go
index b9a5286c..be15b7b2 100644
--- a/example/task_manager/modules/task/model.rony.go
+++ b/example/task_manager/modules/task/model.rony.go
@@ -1,6 +1,6 @@
 // Code generated by Rony's protoc plugin; DO NOT EDIT.
 // ProtoC ver. v3.17.3
-// Rony ver. v0.12.38
+// Rony ver. v0.12.39
 // Source: model.proto
 
 package task
diff --git a/example/task_manager/modules/task/rpc.rony.go b/example/task_manager/modules/task/rpc.rony.go
index 19c9cd6d..578d7fe9 100644
--- a/example/task_manager/modules/task/rpc.rony.go
+++ b/example/task_manager/modules/task/rpc.rony.go
@@ -1,6 +1,6 @@
 // Code generated by Rony's protoc plugin; DO NOT EDIT.
 // ProtoC ver. v3.17.3
-// Rony ver. v0.12.38
+// Rony ver. v0.12.39
 // Source: rpc.proto
 
 package task
diff --git a/internal/codegen/version.go b/internal/codegen/version.go
index e11564e9..bfc12044 100644
--- a/internal/codegen/version.go
+++ b/internal/codegen/version.go
@@ -2,6 +2,6 @@
 package codegen
 
 var (
-	Commit  = "d8f6b0928f61507b321c6d2750e20cd09f090870"
-	Version = "v0.12.39"
+	Commit  = "a230ceb58a4b6d4ab95187dbb7cbd97a75fcd02d"
+	Version = "v0.12.40"
 )
diff --git a/internal/msg/imsg.rony.go b/internal/msg/imsg.rony.go
index cb583507..7eac0819 100644
--- a/internal/msg/imsg.rony.go
+++ b/internal/msg/imsg.rony.go
@@ -1,6 +1,6 @@
 // Code generated by Rony's protoc plugin; DO NOT EDIT.
 // ProtoC ver. v3.17.3
-// Rony ver. v0.12.38
+// Rony ver. v0.12.39
 // Source: imsg.proto
 
 package msg
diff --git a/internal/testEnv/pb/model/model.rony.go b/internal/testEnv/pb/model/model.rony.go
index 360641c6..0fa9765b 100644
--- a/internal/testEnv/pb/model/model.rony.go
+++ b/internal/testEnv/pb/model/model.rony.go
@@ -1,6 +1,6 @@
 // Code generated by Rony's protoc plugin; DO NOT EDIT.
 // ProtoC ver. v3.17.3
-// Rony ver. v0.12.38
+// Rony ver. v0.12.39
 // Source: model.proto
 
 package model
diff --git a/internal/testEnv/pb/service/service.rony.go b/internal/testEnv/pb/service/service.rony.go
index 5c3cd114..2d555c12 100644
--- a/internal/testEnv/pb/service/service.rony.go
+++ b/internal/testEnv/pb/service/service.rony.go
@@ -1,6 +1,6 @@
 // Code generated by Rony's protoc plugin; DO NOT EDIT.
 // ProtoC ver. v3.17.3
-// Rony ver. v0.12.38
+// Rony ver. v0.12.39
 // Source: service.proto
 
 package service
diff --git a/internal/testEnv/pb/singleton/singleton.rony.go b/internal/testEnv/pb/singleton/singleton.rony.go
index f562db6a..8a27a332 100644
--- a/internal/testEnv/pb/singleton/singleton.rony.go
+++ b/internal/testEnv/pb/singleton/singleton.rony.go
@@ -1,6 +1,6 @@
 // Code generated by Rony's protoc plugin; DO NOT EDIT.
 // ProtoC ver. v3.17.3
-// Rony ver. v0.12.38
+// Rony ver. v0.12.39
 // Source: singleton.proto
 
 package singleton
diff --git a/internal/tunnel/udp/tunnel.go b/internal/tunnel/udp/tunnel.go
index faff661e..62f6184a 100644
--- a/internal/tunnel/udp/tunnel.go
+++ b/internal/tunnel/udp/tunnel.go
@@ -122,7 +122,7 @@ func (t *Tunnel) Shutdown() {
 	ctx, cf := context.WithTimeout(context.TODO(), time.Second*30)
 	defer cf()
 	if err := gnet.Stop(ctx, fmt.Sprintf("udp://%s", t.cfg.ListenAddress)); err != nil {
-		log.Warn("Error On Stopping Tunnel", zap.Error(err))
+		t.cfg.Logger.Warn("Error On Stopping Tunnel", zap.Error(err))
 	}
 }
 
@@ -139,17 +139,17 @@ func (t *Tunnel) OnInitComplete(server gnet.Server) (action gnet.Action) {
 }
 
 func (t *Tunnel) OnShutdown(server gnet.Server) {
-	log.Info("Tunnel shutdown")
+	t.cfg.Logger.Info("Tunnel shutdown")
 }
 
 func (t *Tunnel) OnOpened(c gnet.Conn) (out []byte, action gnet.Action) {
-	log.Info("Tunnel connection opened")
+	t.cfg.Logger.Info("Tunnel connection opened")
 
 	return nil, gnet.None
 }
 
 func (t *Tunnel) OnClosed(c gnet.Conn, err error) (action gnet.Action) {
-	log.Info("Tunnel connection closed", zap.Error(err))
+	t.cfg.Logger.Info("Tunnel connection closed", zap.Error(err))
 
 	return gnet.None
 }
@@ -164,7 +164,7 @@ func (t *Tunnel) React(frame []byte, c gnet.Conn) (out []byte, action gnet.Actio
 
 	req := msg.PoolTunnelMessage.Get()
 	if err := req.Unmarshal(frame); err != nil {
-		log.Warn("Error On Tunnel's data received", zap.Error(err))
+		t.cfg.Logger.Warn("Error On Tunnel's data received", zap.Error(err))
 		return nil, gnet.Close
 	}
 
diff --git a/log/log.go b/log/log.go
index f02e618e..c2fb36f1 100644
--- a/log/log.go
+++ b/log/log.go
@@ -54,9 +54,8 @@ func init() {
 	DefaultLogger = New(DefaultConfig)
 }
 
-func Init(config Config) Logger {
+func Init(config Config) {
 	DefaultLogger = New(config)
-	return DefaultLogger
 }
 
 func Debug(msg string, fields ...Field) {
diff --git a/log/log_test.go b/log/log_test.go
new file mode 100644
index 00000000..8e5450c5
--- /dev/null
+++ b/log/log_test.go
@@ -0,0 +1,18 @@
+package log_test
+
+import (
+	"github.com/ronaksoft/rony/log"
+	. "github.com/smartystreets/goconvey/convey"
+	"testing"
+)
+
+func TestLog(t *testing.T) {
+	Convey("Log", t, func(c C) {
+		l := log.New(log.DefaultConfig)
+		l.SetLevel(log.DebugLevel)
+		l.Info("INFO1")
+		l.Sugared().Info("INFO", 1)
+		l.Sugared().Infof("INFO %d", 1)
+
+	})
+}
diff --git a/log/logger.go b/log/logger.go
index 10781523..8d78cc84 100644
--- a/log/logger.go
+++ b/log/logger.go
@@ -93,7 +93,12 @@ func New(cfg Config) *ronyLogger {
 		zap.AddStacktrace(ErrorLevel),
 		zap.AddCallerSkip(cfg.SkipCaller),
 	)
-	l.sz = l.z.Sugar()
+	l.sz = zap.New(
+		zapcore.NewTee(cores...),
+		zap.AddCaller(),
+		zap.AddStacktrace(ErrorLevel),
+		zap.AddCallerSkip(cfg.SkipCaller-1),
+	).Sugar()
 
 	return l
 }
diff --git a/msg.rony.go b/msg.rony.go
index bc899e88..116f46ae 100644
--- a/msg.rony.go
+++ b/msg.rony.go
@@ -1,6 +1,6 @@
 // Code generated by Rony's protoc plugin; DO NOT EDIT.
 // ProtoC ver. v3.17.3
-// Rony ver. v0.12.38
+// Rony ver. v0.12.39
 // Source: msg.proto
 
 package rony