diff --git a/lib/srdb1/schema/topos_d.xml b/lib/srdb1/schema/topos_d.xml
index 2664f27c28e..4f53dc5fd55 100644
--- a/lib/srdb1/schema/topos_d.xml
+++ b/lib/srdb1/schema/topos_d.xml
@@ -179,20 +179,36 @@
 		<description>The R-URI</description>
 	</column>
 
-    <column id="a_srcip">
-        <name>a_srcip</name>
+    <column id="a_srcaddr">
+        <name>a_srcaddr</name>
         <type>string</type>
-        <size>&ip_add_len;</size>
+        <size>&uri_len;</size>
+        <default/>
+        <description>Source address - A side</description>
+    </column>
+
+    <column id="b_srcaddr">
+        <name>b_srcaddr</name>
+        <type>string</type>
+        <size>&uri_len;</size>
         <default/>
-        <description>Source IP address</description>
+        <description>Source address - B side</description>
     </column>
 
-    <column id="b_srcip">
-        <name>b_srcip</name>
+    <column id="a_socket">
+        <name>a_socket</name>
         <type>string</type>
-        <size>&ip_add_len;</size>
+        <size>&uri_len;</size>
+        <default/>
+        <description>Socket address - A side</description>
+    </column>
+
+    <column id="b_socket">
+        <name>b_socket</name>
+        <type>string</type>
+        <size>&uri_len;</size>
         <default/>
-        <description>Destination IP address</description>
+        <description>Socket address - B side</description>
     </column>
 
     <index>
diff --git a/lib/srdb1/schema/topos_t.xml b/lib/srdb1/schema/topos_t.xml
index 08c296a915f..de3a65cf0b2 100644
--- a/lib/srdb1/schema/topos_t.xml
+++ b/lib/srdb1/schema/topos_t.xml
@@ -138,6 +138,38 @@
 		<description>From tag - A or B side.</description>
 	</column>
 
+    <column id="a_srcaddr">
+        <name>a_srcaddr</name>
+        <type>string</type>
+        <size>&uri_len;</size>
+        <default/>
+        <description>Source address - A side</description>
+    </column>
+
+    <column id="b_srcaddr">
+        <name>b_srcaddr</name>
+        <type>string</type>
+        <size>&uri_len;</size>
+        <default/>
+        <description>Source address - B side</description>
+    </column>
+
+    <column id="a_socket">
+        <name>a_socket</name>
+        <type>string</type>
+        <size>&uri_len;</size>
+        <default/>
+        <description>Socket address - A side</description>
+    </column>
+
+    <column id="b_socket">
+        <name>b_socket</name>
+        <type>string</type>
+        <size>&uri_len;</size>
+        <default/>
+        <description>Socket address - B side</description>
+    </column>
+
     <index>
         <name>rectime_idx</name>
         <colref linkend="rectime"/>