diff --git a/agents/libdiam_test.go b/agents/libdiam_test.go
index 6826bfc65..376df1f83 100644
--- a/agents/libdiam_test.go
+++ b/agents/libdiam_test.go
@@ -339,6 +339,22 @@ func TestMessageSetAVPsWithPath5(t *testing.T) {
 	}
 }
 
+// In case we send -1 as CC-Time we get error from go-diameter :
+// " strconv.ParseUint: parsing "-1": invalid syntax "
+// and crashed
+/*
+func TestMessageSetAVPsWithPath6(t *testing.T) {
+	m := diam.NewMessage(diam.CreditControl, diam.RequestFlag, 4,
+		eMessage.Header.HopByHopID, eMessage.Header.EndToEndID, nil)
+
+	if err := messageSetAVPsWithPath(m,
+		[]string{"Granted-Service-Unit", "CC-Time"}, "-1",
+		false, "UTC"); err != nil {
+		t.Error(err)
+	}
+}
+*/
+
 func TestdisectDiamListen(t *testing.T) {
 	expIPs := []string{"192.168.56.203", "192.168.57.203"}
 	rvc := disectDiamListen("192.168.56.203/192.168.57.203:3869")
diff --git a/data/storage/mysql/create_tariffplan_tables.sql b/data/storage/mysql/create_tariffplan_tables.sql
index bb02c2213..53744d7d3 100644
--- a/data/storage/mysql/create_tariffplan_tables.sql
+++ b/data/storage/mysql/create_tariffplan_tables.sql
@@ -110,7 +110,7 @@ CREATE TABLE `tp_rating_profiles` (
   `tenant` varchar(64) NOT NULL,
   `category` varchar(32) NOT NULL,
   `subject` varchar(64) NOT NULL,
-  `activation_time` varchar(24) NOT NULL,
+  `activation_time` varchar(26) NOT NULL,
   `rating_plan_tag` varchar(64) NOT NULL,
   `fallback_subjects` varchar(64),
   `cdr_stat_queue_ids` varchar(64),
@@ -153,7 +153,7 @@ CREATE TABLE `tp_actions` (
   `balance_type` varchar(24) NOT NULL,
   `directions` varchar(8) NOT NULL,
   `units` varchar(256) NOT NULL,
-  `expiry_time` varchar(24) NOT NULL,
+  `expiry_time` varchar(26) NOT NULL,
   `timing_tags` varchar(128) NOT NULL,
   `destination_tags` varchar(64) NOT NULL,
   `rating_subject` varchar(64) NOT NULL,
@@ -203,8 +203,8 @@ CREATE TABLE `tp_action_triggers` (
   `threshold_value` DECIMAL(20,4) NOT NULL,
   `recurrent` BOOLEAN NOT NULL,
   `min_sleep` varchar(16) NOT NULL,
-  `expiry_time` varchar(24) NOT NULL,
-  `activation_time` varchar(24) NOT NULL,
+  `expiry_time` varchar(26) NOT NULL,
+  `activation_time` varchar(26) NOT NULL,
   `balance_tag` varchar(64) NOT NULL,
   `balance_type` varchar(24) NOT NULL,
   `balance_directions` varchar(8) NOT NULL,
@@ -212,7 +212,7 @@ CREATE TABLE `tp_action_triggers` (
   `balance_destination_tags` varchar(64) NOT NULL,
   `balance_rating_subject` varchar(64) NOT NULL,
   `balance_shared_groups` varchar(64) NOT NULL,
-  `balance_expiry_time` varchar(24) NOT NULL,
+  `balance_expiry_time` varchar(26) NOT NULL,
   `balance_timing_tags` varchar(128) NOT NULL,
   `balance_weight` varchar(10) NOT NULL,
   `balance_blocker` varchar(5) NOT NULL,
diff --git a/data/storage/postgres/create_tariffplan_tables.sql b/data/storage/postgres/create_tariffplan_tables.sql
index fac56a508..1236d88ad 100644
--- a/data/storage/postgres/create_tariffplan_tables.sql
+++ b/data/storage/postgres/create_tariffplan_tables.sql
@@ -106,7 +106,7 @@ CREATE TABLE tp_rating_profiles (
   tenant VARCHAR(64) NOT NULL,
   category VARCHAR(32) NOT NULL,
   subject VARCHAR(64) NOT NULL,
-  activation_time VARCHAR(24) NOT NULL,
+  activation_time VARCHAR(26) NOT NULL,
   rating_plan_tag VARCHAR(64) NOT NULL,
   fallback_subjects VARCHAR(64),
   cdr_stat_queue_ids VARCHAR(64),
@@ -148,7 +148,7 @@ CREATE TABLE tp_actions (
   balance_type VARCHAR(24) NOT NULL,
   directions VARCHAR(8) NOT NULL,
   units VARCHAR(256) NOT NULL,
-  expiry_time VARCHAR(24) NOT NULL,
+  expiry_time VARCHAR(26) NOT NULL,
   timing_tags VARCHAR(128) NOT NULL,
   destination_tags VARCHAR(64) NOT NULL,
   rating_subject VARCHAR(64) NOT NULL,
@@ -198,8 +198,8 @@ CREATE TABLE tp_action_triggers (
   threshold_value NUMERIC(20,4) NOT NULL,
   recurrent BOOLEAN NOT NULL,
   min_sleep VARCHAR(16) NOT NULL,
-  expiry_time VARCHAR(24) NOT NULL,
-  activation_time VARCHAR(24) NOT NULL,
+  expiry_time VARCHAR(26) NOT NULL,
+  activation_time VARCHAR(26) NOT NULL,
   balance_tag VARCHAR(64) NOT NULL,
   balance_type VARCHAR(24) NOT NULL,
   balance_directions VARCHAR(8) NOT NULL,
@@ -207,7 +207,7 @@ CREATE TABLE tp_action_triggers (
   balance_destination_tags VARCHAR(64) NOT NULL,
   balance_rating_subject VARCHAR(64) NOT NULL,
   balance_shared_groups VARCHAR(64) NOT NULL,
-  balance_expiry_time VARCHAR(24) NOT NULL,
+  balance_expiry_time VARCHAR(26) NOT NULL,
   balance_timing_tags VARCHAR(128) NOT NULL,
   balance_weight VARCHAR(10) NOT NULL,
   balance_blocker VARCHAR(5) NOT NULL,