diff --git a/data/tariffplans/cluelrn/Attributes.csv b/data/tariffplans/cluelrn/Attributes.csv
index 5e8686d31..d249c09e9 100644
--- a/data/tariffplans/cluelrn/Attributes.csv
+++ b/data/tariffplans/cluelrn/Attributes.csv
@@ -1,6 +1,7 @@
 #Tenant,ID,Contexts,FilterIDs,ActivationInterval,AttributeFilterIDs,Path,Type,Value,Blocker,Weight
 cgrates.org,LRN_Dst3125650565,lrn,*string:~*req.Destination:3125650565,,,*req.Destination,*constant,13128543000,false,10
-cgrates.org,LRN_Dst3125650565,,,,,*req.OriginalDestination,*constant,3125650565,false,10
+cgrates.org,LRN_Dst3125650565,,,,,*req.Destination,*constant,13128543000,,
+cgrates.org,LRN_Dst3125650565,,,,,*req.OriginalDestination,*constant,3125650565,,
 cgrates.org,LRN_LATA_Dst13128543000,lrn,*string:~*req.Destination:13128543000;*notempty:~*req.OriginalDestination:,,,*req.DestinationLATA,*constant,358,false,20
 cgrates.org,LRN_LATA_Cli9174269000,lrn,*string:~*req.Account:9174269000;*notempty:~*req.DestinationLATA:,,,*req.CallerLATA,*constant,132,false,30
 cgrates.org,LRN_JURISDICTION_NY,lrn,FLTR_INTRALATA_NEWYORK,,,*req.LRNJurisdiction,*constant,INTRA,false,50
diff --git a/data/tariffplans/cluelrn/Routes.csv b/data/tariffplans/cluelrn/Routes.csv
index c49901e19..303057f66 100644
--- a/data/tariffplans/cluelrn/Routes.csv
+++ b/data/tariffplans/cluelrn/Routes.csv
@@ -1,4 +1,5 @@
 #Tenant,ID,FilterIDs,ActivationInterval,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRatingPlanIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters,Weight
-cgrates.org,ROUTE_CLUELRN_INTER,*string:~*req.Account:9174269000;*string:~*req.LRNJurisdiction:INTER,2017-11-27T00:00:00Z,*lc,,LEVEL3,,,RP_LEVEL3_INTER,,,,false,,10
+cgrates.org,ROUTE_CLUELRN_INTER,*string:~*req.Account:9174269000;*string:~*req.LRNJurisdiction:INTER,2017-11-27T00:00:00Z,*lc,,,,,,,,,,,10
+cgrates.org,ROUTE_CLUELRN_INTER,,,,,LEVEL3,,,RP_LEVEL3_INTER,,,,false,,
 cgrates.org,ROUTE_CLUELRN_INTER,,,,,TMOBILE,,,RP_TMOBILE_INTER,,,,false,,
 cgrates.org,ROUTE_CLUELRN_INTER,,,,,COMCAST,,,RP_COMCAST_INTER,,,,false,,
diff --git a/data/tariffplans/dnsagent/Routes.csv b/data/tariffplans/dnsagent/Routes.csv
index 44bb1b648..e93bd5bd1 100644
--- a/data/tariffplans/dnsagent/Routes.csv
+++ b/data/tariffplans/dnsagent/Routes.csv
@@ -1,4 +1,5 @@
 #Tenant,ID,FilterIDs,ActivationInterval,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRatingPlanIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters,Weight
-cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,,*weight,,route1,,,,,,10,,!^(.*)$!sip:\1@172.16.1.11!,10
-cgrates.org,ROUTE_ACNT_1001,,,,,route2,,,,,,5,,!^(.*)$!sip:\1@172.16.1.12!,10
+cgrates.org,ROUTE_ACNT_1001,*string:~*req.Account:1001,,*weight,,,,,,,,,,,10
+cgrates.org,ROUTE_ACNT_1001,,,,,route1,,,,,,10,,!^(.*)$!sip:\1@172.16.1.11!,
+cgrates.org,ROUTE_ACNT_1001,,,,,route2,,,,,,5,,!^(.*)$!sip:\1@172.16.1.12!,
 
diff --git a/data/tariffplans/oldtutorial/Attributes.csv b/data/tariffplans/oldtutorial/Attributes.csv
index 8563610bc..30513b14f 100644
--- a/data/tariffplans/oldtutorial/Attributes.csv
+++ b/data/tariffplans/oldtutorial/Attributes.csv
@@ -1,4 +1,6 @@
 #Tenant,ID,Contexts,FilterIDs,ActivationInterval,AttributeFilterIDs,Path,Type,Value,Blocker,Weight
-cgrates.org,ATTR_1,*sessions;*cdrs,*string:~*req.Account:1007,2014-01-14T00:00:00Z,,*req.Account,*constant,1001,false,10
+cgrates.org,ATTR_1,*sessions;*cdrs,*string:~*req.Account:1007,2014-01-14T00:00:00Z,,,,,false,10
+cgrates.org,ATTR_1,,,,,*req.Account,*constant,1001,,
 cgrates.org,ATTR_1,,,,,*req.Subject,*constant,1001,,
+
 cgrates.org,ATTR_PASS,*sessions,*string:~*req.Account:1001,,,*req.PasswordFromAttributes,*constant,CGRateSPassword1,false,10
\ No newline at end of file
diff --git a/data/tariffplans/oldtutorial/Rates.csv b/data/tariffplans/oldtutorial/Rates.csv
index f4ca8a14f..921d61137 100644
--- a/data/tariffplans/oldtutorial/Rates.csv
+++ b/data/tariffplans/oldtutorial/Rates.csv
@@ -1,10 +1,15 @@
 #Id,ConnectFee,Rate,RateUnit,RateIncrement,GroupIntervalStart
 RT_10CNT,0.2,0.1,60s,60s,0s
 RT_10CNT,0,0.05,60s,1s,60s
+
 RT_20CNT,0.4,0.2,60s,60s,0s
 RT_20CNT,0,0.1,60s,1s,60s
+
 RT_40CNT,0.8,0.4,60s,30s,0s
 RT_40CNT,0,0.2,60s,10s,60s
+
 RT_1CNT,0,0.01,60s,60s,0s
+
 RT_1CNT_PER_SEC,0,0.01,1s,1s,0s
+
 RT_GENERIC_1,0,1,1,1,0
diff --git a/data/tariffplans/oldtutorial/Routes.csv b/data/tariffplans/oldtutorial/Routes.csv
index 0b52afdd4..5c1578f7b 100644
--- a/data/tariffplans/oldtutorial/Routes.csv
+++ b/data/tariffplans/oldtutorial/Routes.csv
@@ -1,8 +1,12 @@
 #Tenant,ID,FilterIDs,ActivationInterval,Sorting,SortingParameters,RouteID,RouteFilterIDs,RouteAccountIDs,RouteRatingPlanIDs,RouteResourceIDs,RouteStatIDs,RouteWeight,RouteBlocker,RouteParameters,Weight
 cgrates.org,ROUTE_WEIGHT_2,,2017-11-27T00:00:00Z,*weight,,route1,,,,,,10,,,5
-cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,2017-11-27T00:00:00Z,*weight,,route1,,,,,,10,,,10
+
+cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE;FLTR_ACNT_1007,2017-11-27T00:00:00Z,*weight,,,,,,,,,,,10
+cgrates.org,ROUTE_WEIGHT_1,,,,,route1,,,,,,10,,,
 cgrates.org,ROUTE_WEIGHT_1,FLTR_DST_DE,,,,route2,,,,,,20,,,
 cgrates.org,ROUTE_WEIGHT_1,FLTR_ACNT_1007,,,,route3,FLTR_ACNT_dan,,,,,15,,,
-cgrates.org,ROUTE_LEASTCOST_1,FLTR_1,2017-11-27T00:00:00Z,*lc,,route1,,,RP_SPECIAL_1002,,,10,false,,10
+
+cgrates.org,ROUTE_LEASTCOST_1,FLTR_1,2017-11-27T00:00:00Z,*lc,,,,,,,,,,,10
+cgrates.org,ROUTE_LEASTCOST_1,,,,,route1,,,RP_SPECIAL_1002,,,10,false,,
 cgrates.org,ROUTE_LEASTCOST_1,,,,,route2,,,RP_RETAIL1,,,20,,,
 cgrates.org,ROUTE_LEASTCOST_1,,,,,route3,,,RP_SPECIAL_1002,,,15,,,
diff --git a/data/tariffplans/oldtutorial/Stats.csv b/data/tariffplans/oldtutorial/Stats.csv
index c5d67031d..d99bced58 100644
--- a/data/tariffplans/oldtutorial/Stats.csv
+++ b/data/tariffplans/oldtutorial/Stats.csv
@@ -1,4 +1,5 @@
 #Tenant[0],Id[1],FilterIDs[2],ActivationInterval[3],QueueLength[4],TTL[5],MinItems[6],Metrics[7],MetricFilterIDs[8],Stored[9],Blocker[10],Weight[11],ThresholdIDs[12]
-cgrates.org,Stats1,FLTR_STS1,2014-07-29T15:00:00Z,100,3s,2,*asr;*acc;*tcc;*acd;*tcd,,true,false,20,*none
+cgrates.org,Stats1,FLTR_STS1,2014-07-29T15:00:00Z,100,3s,2,,,true,false,20,*none
+cgrates.org,Stats1,,,,,,*asr;*acc;*tcc;*acd;*tcd,,,,,
 cgrates.org,Stats1,,,,,,*sum#~*req.Usage;*average#~*req.Usage,,,,,
 cgrates.org,Stats1,,,,,,*pdd,*exists:~*req.PDD:,,,,
\ No newline at end of file