diff --git a/pgsql-schema.sql b/pgsql-schema.sql
index b9ab87e..494467b 100644
--- a/pgsql-schema.sql
+++ b/pgsql-schema.sql
@@ -18,21 +18,21 @@ CREATE TABLE IF NOT EXISTS ct_logs (
   orig_ip_protocol smallint default NULL,
   orig_l4_sport integer default NULL,
   orig_l4_dport integer default NULL,
-  orig_raw_pktlen bigint default 0,
-  orig_raw_pktcount bigint default 0,
+  orig_raw_pktlen bigint default NULL,
+  orig_raw_pktcount bigint default NULL,
   reply_ip_saddr_str inet default NULL,
   reply_ip_daddr_str inet default NULL,
   reply_ip_protocol smallint default NULL,
   reply_l4_sport integer default NULL,
   reply_l4_dport integer default NULL,
-  reply_raw_pktlen bigint default 0,
-  reply_raw_pktcount bigint default 0,
+  reply_raw_pktlen bigint default NULL,
+  reply_raw_pktcount bigint default NULL,
   icmp_code smallint default NULL,
   icmp_type smallint default NULL,
-  ct_mark bigint default 0,
+  ct_mark bigint default NULL,
   flow_start timestamp default NULL,
   flow_end timestamp default NULL,
-  ct_event smallint default 0
+  ct_event smallint default NULL
 );
 
 -- Table used to build the argument list passed by ulog
@@ -41,29 +41,29 @@ CREATE TABLE IF NOT EXISTS ct_logs (
 DROP TABLE IF EXISTS ulog2_ct_model;
 CREATE TABLE ulog2_ct_model (
   ct_id bigint PRIMARY KEY UNIQUE NOT NULL,
-  oob_family smallint default NULL,
-  orig_ip_saddr_str inet default NULL,
-  orig_ip_daddr_str inet default NULL,
-  orig_ip_protocol smallint default NULL,
-  orig_l4_sport integer default NULL,
-  orig_l4_dport integer default NULL,
-  orig_raw_pktlen bigint default 0,
-  orig_raw_pktcount bigint default 0,
-  reply_ip_saddr_str inet default NULL,
-  reply_ip_daddr_str inet default NULL,
-  reply_ip_protocol smallint default NULL,
-  reply_l4_sport integer default NULL,
-  reply_l4_dport integer default NULL,
-  reply_raw_pktlen bigint default 0,
-  reply_raw_pktcount bigint default 0,
-  icmp_code smallint default NULL,
-  icmp_type smallint default NULL,
-  ct_mark bigint default 0,
-  flow_start_sec bigint default 0,
-  flow_start_usec bigint default 0,
-  flow_end_sec bigint default 0,
-  flow_end_usec bigint default 0,
-  ct_event smallint default 0
+  oob_family smallint,
+  orig_ip_saddr_str inet,
+  orig_ip_daddr_str inet,
+  orig_ip_protocol smallint,
+  orig_l4_sport integer,
+  orig_l4_dport integer,
+  orig_raw_pktlen bigint,
+  orig_raw_pktcount bigint,
+  reply_ip_saddr_str inet,
+  reply_ip_daddr_str inet,
+  reply_ip_protocol smallint,
+  reply_l4_sport integer,
+  reply_l4_dport integer,
+  reply_raw_pktlen bigint,
+  reply_raw_pktcount bigint,
+  icmp_code smallint,
+  icmp_type smallint,
+  ct_mark bigint,
+  flow_start_sec bigint,
+  flow_start_usec bigint,
+  flow_end_sec bigint,
+  flow_end_usec bigint,
+  ct_event smallint
 );
 
 --