diff --git a/context/config.go b/context/config.go
index a03e1d1..be05a22 100644
--- a/context/config.go
+++ b/context/config.go
@@ -1 +1,175 @@
+/*
+MIT License
+
+Copyright (c) 2019 Nicolas JUHEL
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
 package context
+
+import (
+	"context"
+	"sync/atomic"
+)
+
+type Config interface {
+	context.Context
+
+	Merge(cfg Config) bool
+
+	Store(key string, cfg interface{})
+	Load(key string) interface{}
+
+	ObjectStore(key string, obj interface{})
+	ObjectLoad(key string) interface{}
+}
+
+func NewConfig(ctx context.Context) Config {
+	return &configContext{
+		Context: ctx,
+		cfg:     &atomic.Value{},
+		obj:     &atomic.Value{},
+	}
+}
+
+type configContext struct {
+	context.Context
+	cfg *atomic.Value
+	obj *atomic.Value
+}
+
+func (c *configContext) Store(key string, cfg interface{}) {
+	var (
+		v  interface{}
+		s  map[string]*atomic.Value
+		ok bool
+	)
+
+	if v = c.cfg.Load(); v == nil {
+		s = make(map[string]*atomic.Value, 0)
+	} else if s, ok = v.(map[string]*atomic.Value); !ok {
+		s = make(map[string]*atomic.Value, 0)
+	}
+
+	if _, ok = s[key]; !ok {
+		s[key] = &atomic.Value{}
+	}
+
+	s[key].Store(cfg)
+	c.cfg.Store(s)
+}
+
+func (c *configContext) Load(key string) interface{} {
+	var (
+		v  interface{}
+		s  map[string]*atomic.Value
+		ok bool
+	)
+
+	if v = c.cfg.Load(); v == nil {
+		return nil
+	} else if s, ok = v.(map[string]*atomic.Value); !ok {
+		return nil
+	} else if _, ok = s[key]; !ok {
+		return nil
+	} else {
+		return s[key].Load()
+	}
+}
+
+func (c *configContext) Merge(cfg Config) bool {
+	var (
+		x  *configContext
+		vx interface{}
+		ix interface{}
+		sc map[string]*atomic.Value
+		sx map[string]*atomic.Value
+		ok bool
+	)
+
+	if x, ok = cfg.(*configContext); !ok {
+		return false
+	}
+
+	sc = make(map[string]*atomic.Value, 0)
+
+	if vx = x.cfg.Load(); vx == nil {
+		sx = make(map[string]*atomic.Value, 0)
+	} else if sx, ok = vx.(map[string]*atomic.Value); !ok {
+		sx = make(map[string]*atomic.Value, 0)
+	}
+
+	for k, v := range sx {
+		if k == "" || v == nil {
+			continue
+		}
+
+		ix = v.Load()
+		if ix == nil {
+			continue
+		}
+
+		sc[k] = &atomic.Value{}
+		sc[k].Store(ix)
+	}
+
+	c.cfg.Store(sc)
+
+	return true
+}
+
+func (c *configContext) ObjectStore(key string, obj interface{}) {
+	var (
+		v  interface{}
+		s  map[string]*atomic.Value
+		ok bool
+	)
+
+	if v = c.obj.Load(); v == nil {
+		s = make(map[string]*atomic.Value, 0)
+	} else if s, ok = v.(map[string]*atomic.Value); !ok {
+		s = make(map[string]*atomic.Value, 0)
+	}
+
+	if _, ok = s[key]; !ok {
+		s[key] = &atomic.Value{}
+	}
+
+	s[key].Store(obj)
+	c.obj.Store(s)
+}
+
+func (c *configContext) ObjectLoad(key string) interface{} {
+	var (
+		v  interface{}
+		s  map[string]*atomic.Value
+		ok bool
+	)
+
+	if v = c.obj.Load(); v == nil {
+		return nil
+	} else if s, ok = v.(map[string]*atomic.Value); !ok {
+		return nil
+	} else if _, ok = s[key]; !ok {
+		return nil
+	} else {
+		return s[key].Load()
+	}
+}
diff --git a/context/ginTonic.go b/context/ginTonic.go
index a31fbd1..f0a97cb 100644
--- a/context/ginTonic.go
+++ b/context/ginTonic.go
@@ -101,8 +101,9 @@ func (c *ctxGinTonic) CancelOnSignal(s ...os.Signal) {
 		select {
 		case <-sc:
 			c.c()
+			return
 		case <-c.Done():
-
+			return
 		}
 	}()
 }