diff --git a/balancer2go b/balancer2go
new file mode 160000
index 000000000..9ad3b71de
--- /dev/null
+++ b/balancer2go
@@ -0,0 +1 @@
+Subproject commit 9ad3b71de83a8bd095b5c6b191e8253ecc34cf3c
diff --git a/cache2go b/cache2go
new file mode 160000
index 000000000..54df7dbe6
--- /dev/null
+++ b/cache2go
@@ -0,0 +1 @@
+Subproject commit 54df7dbe655fa84a4d03651ad9e043c1c021f874
diff --git a/cmd/cgr-rater/cgr-rater.go b/cmd/cgr-rater/cgr-rater.go
index fa7963cff..677677baf 100644
--- a/cmd/cgr-rater/cgr-rater.go
+++ b/cmd/cgr-rater/cgr-rater.go
@@ -23,11 +23,11 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"github.com/cgrates/cgrates/balancer2go"
 	"github.com/cgrates/cgrates/mediator"
 	"github.com/cgrates/cgrates/scheduler"
 	"github.com/cgrates/cgrates/sessionmanager"
 	"github.com/cgrates/cgrates/timespans"
-	"github.com/rif/balancer2go"
 	"io"
 	"net"
 	"net/rpc"
diff --git a/mediator/mediator.go b/mediator/mediator.go
index d515dc50f..f389d9c0b 100644
--- a/mediator/mediator.go
+++ b/mediator/mediator.go
@@ -159,7 +159,7 @@ func (m *Mediator) parseCSV(cdrfn string) (err error) {
 		} else {
 			record = append(record, strconv.FormatFloat(cc.ConnectFee+cc.Cost, 'f', -1, 64))
 		}
-		w.WriteString(strings.Join(record, ","))
+		w.WriteString(strings.Join(record, ",") + "\n")
 	}
 	return
 }
diff --git a/timespans/activationperiod.go b/timespans/activationperiod.go
index 448d9947d..5ea84a79b 100644
--- a/timespans/activationperiod.go
+++ b/timespans/activationperiod.go
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 package timespans
 
 import (
-	"github.com/rif/cache2go"
+	"github.com/cgrates/cgrates/cache2go"
 	"strconv"
 	"strings"
 	"time"
diff --git a/timespans/calldesc.go b/timespans/calldesc.go
index 3473b6c2c..2d96f8319 100644
--- a/timespans/calldesc.go
+++ b/timespans/calldesc.go
@@ -21,7 +21,7 @@ package timespans
 import (
 	"errors"
 	"fmt"
-	"github.com/rif/cache2go"
+	"github.com/cgrates/cgrates/cache2go"
 	"log/syslog"
 	"math"
 	"time"
diff --git a/timespans/destinations.go b/timespans/destinations.go
index 7ff194343..921121ad8 100644
--- a/timespans/destinations.go
+++ b/timespans/destinations.go
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 package timespans
 
 import (
-	"github.com/rif/cache2go"
+	"github.com/cgrates/cgrates/cache2go"
 	"strings"
 )
 
diff --git a/timespans/destinations_test.go b/timespans/destinations_test.go
index 25cad6145..3f87545e1 100644
--- a/timespans/destinations_test.go
+++ b/timespans/destinations_test.go
@@ -20,7 +20,7 @@ package timespans
 
 import (
 	"encoding/json"
-	"github.com/rif/cache2go"
+	"github.com/cgrates/cgrates/cache2go"
 	"reflect"
 	"testing"
 )
diff --git a/timespans/responder.go b/timespans/responder.go
index 29658614c..4e6e2742d 100644
--- a/timespans/responder.go
+++ b/timespans/responder.go
@@ -21,8 +21,8 @@ package timespans
 import (
 	"errors"
 	"fmt"
+	"github.com/cgrates/cgrates/balancer2go"
 	"github.com/cgrates/cgrates/console"
-	"github.com/rif/balancer2go"
 	"net/rpc"
 	"reflect"
 	"runtime"