diff --git a/agents/astagent.go b/agents/astagent.go
index 2bfc29502..51d1d35b0 100644
--- a/agents/astagent.go
+++ b/agents/astagent.go
@@ -83,14 +83,10 @@ func (sma *AsteriskAgent) connectAsterisk(stopChan <-chan struct{}) (err error)
 	connCfg := sma.cgrCfg.AsteriskAgentCfg().AsteriskConns[sma.astConnIdx]
 	sma.astEvChan = make(chan map[string]interface{})
 	sma.astErrChan = make(chan error)
-	var maxReconnectInterval time.Duration
-	if maxReconnectInterval, err = utils.ParseDurationWithNanosecs(connCfg.MaxReconnectInterval); err != nil {
-		return
-	}
 	sma.astConn, err = aringo.NewARInGO(fmt.Sprintf("ws://%s/ari/events?api_key=%s:%s&app=%s",
 		connCfg.Address, connCfg.User, connCfg.Password, CGRAuthAPP), "http://cgrates.org",
 		connCfg.User, connCfg.Password, fmt.Sprintf("%s@%s", utils.CGRateS, utils.Version),
-		sma.astEvChan, sma.astErrChan, stopChan, connCfg.ConnectAttempts, connCfg.Reconnects, maxReconnectInterval)
+		sma.astEvChan, sma.astErrChan, stopChan, connCfg.ConnectAttempts, connCfg.Reconnects, connCfg.MaxReconnectInterval, utils.FibDuration)
 	return
 }
 
diff --git a/agents/fsagent.go b/agents/fsagent.go
index a7e8e90b7..3a3666109 100644
--- a/agents/fsagent.go
+++ b/agents/fsagent.go
@@ -288,12 +288,8 @@ func (fsa *FSsessions) Connect() error {
 	eventFilters := map[string][]string{"Call-Direction": {"inbound"}}
 	errChan := make(chan error)
 	for connIdx, connCfg := range fsa.cfg.EventSocketConns {
-		maxReconnectInterval, err := utils.ParseDurationWithNanosecs(connCfg.MaxReconnectInterval)
-		if err != nil {
-			return err
-		}
-		fSock, err := fsock.NewFSock(connCfg.Address, connCfg.Password, connCfg.Reconnects, maxReconnectInterval,
-			fsa.createHandlers(), eventFilters, utils.Logger.GetSyslog(), connIdx)
+		fSock, err := fsock.NewFSock(connCfg.Address, connCfg.Password, connCfg.Reconnects, connCfg.MaxReconnectInterval, utils.FibDuration,
+			fsa.createHandlers(), eventFilters, utils.Logger.GetSyslog(), connIdx, true)
 		if err != nil {
 			return err
 		}
@@ -307,11 +303,8 @@ func (fsa *FSsessions) Connect() error {
 				errChan <- err
 			}
 		}(fSock)
-		fsSenderPool, err := fsock.NewFSockPool(5, connCfg.Address, connCfg.Password, 1, fsa.cfg.MaxWaitConnection,
-			make(map[string][]func(string, int)), make(map[string][]string), utils.Logger.GetSyslog(), connIdx)
-		if err != nil {
-			return fmt.Errorf("Cannot connect FreeSWITCH senders pool, error: %s", err.Error())
-		}
+		fsSenderPool := fsock.NewFSockPool(5, connCfg.Address, connCfg.Password, 1, fsa.cfg.MaxWaitConnection,
+			0, utils.FibDuration, make(map[string][]func(string, int)), make(map[string][]string), utils.Logger.GetSyslog(), connIdx, true)
 		if fsSenderPool == nil {
 			return errors.New("Cannot connect FreeSWITCH senders pool")
 		}
diff --git a/agents/kamagent.go b/agents/kamagent.go
index 2ee041a78..e4a6d784d 100644
--- a/agents/kamagent.go
+++ b/agents/kamagent.go
@@ -77,12 +77,8 @@ func (self *KamailioAgent) Connect() (err error) {
 	errChan := make(chan error)
 	for connIdx, connCfg := range self.cfg.EvapiConns {
 		logger := log.New(utils.Logger, "kamevapi:", 2)
-		var maxReconnectInterval time.Duration
-		if maxReconnectInterval, err = utils.ParseDurationWithNanosecs(connCfg.MaxReconnectInterval); err != nil {
-			return
-		}
-		if self.conns[connIdx], err = kamevapi.NewKamEvapi(connCfg.Address, connIdx, connCfg.Reconnects, maxReconnectInterval,
-			eventHandlers, logger); err != nil {
+		if self.conns[connIdx], err = kamevapi.NewKamEvapi(connCfg.Address, connIdx, connCfg.Reconnects, connCfg.MaxReconnectInterval,
+			utils.FibDuration, eventHandlers, logger); err != nil {
 			return
 		}
 		utils.Logger.Info(fmt.Sprintf("<%s> successfully connected to Kamailio at: <%s>", utils.KamailioAgent, connCfg.Address))