diff --git a/data/aut-num/AS4242422345 b/data/aut-num/AS4242422345
index 210162b4f..28b6f838d 100644
--- a/data/aut-num/AS4242422345
+++ b/data/aut-num/AS4242422345
@@ -2,5 +2,6 @@ aut-num:            AS4242422345
 as-name:            IIIDEFIX-AS
 admin-c:            IIIDEFIX-DN42
 tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
 mnt-by:             IIIDEFIX-MNT
 source:             DN42
diff --git a/data/dns/iiidefix.dn42 b/data/dns/iiidefix.dn42
new file mode 100644
index 000000000..6b8fa12e6
--- /dev/null
+++ b/data/dns/iiidefix.dn42
@@ -0,0 +1,9 @@
+domain:             iiidefix.dn42
+descr:              iiidefix dns
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
+mnt-by:             IIIDEFIX-MNT
+nserver:            ns1.iiidefix.dn42 172.23.131.53
+nserver:            ns1.iiidefix.dn42 fdb0:4339:ffff::53
+source:             DN42
diff --git a/data/inet6num/fdb0:4339:100::_48 b/data/inet6num/fdb0:4339:100::_48
new file mode 100644
index 000000000..dfd3328cf
--- /dev/null
+++ b/data/inet6num/fdb0:4339:100::_48
@@ -0,0 +1,11 @@
+inet6num:           fdb0:4339:0100:0000:0000:0000:0000:0000 - fdb0:4339:0100:ffff:ffff:ffff:ffff:ffff
+netname:            NET6-IIIDEFIX-DEMHG1-DN42
+descr:              iiidefix demhg1 prefix
+country:            DE
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
+mnt-by:             IIIDEFIX-MNT
+status:             ASSIGNED
+cidr:               fdb0:4339:100::/48
+source:             DN42
diff --git a/data/inet6num/fdb0:4339:120::_48 b/data/inet6num/fdb0:4339:120::_48
new file mode 100644
index 000000000..d00073ef6
--- /dev/null
+++ b/data/inet6num/fdb0:4339:120::_48
@@ -0,0 +1,11 @@
+inet6num:           fdb0:4339:0120:0000:0000:0000:0000:0000 - fdb0:4339:0120:ffff:ffff:ffff:ffff:ffff
+netname:            NET6-IIIDEFIX-DEMHG2-DN42
+descr:              iiidefix demhg2 prefix
+country:            DE
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
+mnt-by:             IIIDEFIX-MNT
+status:             ASSIGNED
+cidr:               fdb0:4339:120::/48
+source:             DN42
diff --git a/data/inet6num/fdb0:4339:140::_48 b/data/inet6num/fdb0:4339:140::_48
new file mode 100644
index 000000000..89bea8510
--- /dev/null
+++ b/data/inet6num/fdb0:4339:140::_48
@@ -0,0 +1,11 @@
+inet6num:           fdb0:4339:0140:0000:0000:0000:0000:0000 - fdb0:4339:0140:ffff:ffff:ffff:ffff:ffff
+netname:            NET6-IIIDEFIX-DEMHG3-DN42
+descr:              iiidefix demgh3 prefix
+country:            DE
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
+mnt-by:             IIIDEFIX-MNT
+status:             ASSIGNED
+cidr:               fdb0:4339:140::/48
+source:             DN42
diff --git a/data/inet6num/fdb0:4339:164::_48 b/data/inet6num/fdb0:4339:164::_48
new file mode 100644
index 000000000..3d8449551
--- /dev/null
+++ b/data/inet6num/fdb0:4339:164::_48
@@ -0,0 +1,11 @@
+inet6num:           fdb0:4339:0164:0000:0000:0000:0000:0000 - fdb0:4339:0164:ffff:ffff:ffff:ffff:ffff
+netname:            NET6-IIIDEFIX-DEACH1-DN42
+descr:              iiidefix deach1 prefix
+country:            DE
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
+mnt-by:             IIIDEFIX-MNT
+status:             ASSIGNED
+cidr:               fdb0:4339:164::/48
+source:             DN42
diff --git a/data/inet6num/fdb0:4339:168::_48 b/data/inet6num/fdb0:4339:168::_48
new file mode 100644
index 000000000..e578f42d6
--- /dev/null
+++ b/data/inet6num/fdb0:4339:168::_48
@@ -0,0 +1,11 @@
+inet6num:           fdb0:4339:0168:0000:0000:0000:0000:0000 - fdb0:4339:0168:ffff:ffff:ffff:ffff:ffff
+netname:            NET6-IIIDEFIX-DEFKS1-DN42
+descr:              iiidefix defks1 prefix
+country:            DE
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
+mnt-by:             IIIDEFIX-MNT
+status:             ASSIGNED
+cidr:               fdb0:4339:168::/48
+source:             DN42
diff --git a/data/inet6num/fdb0:4339:16a::_48 b/data/inet6num/fdb0:4339:16a::_48
new file mode 100644
index 000000000..d7bda65aa
--- /dev/null
+++ b/data/inet6num/fdb0:4339:16a::_48
@@ -0,0 +1,11 @@
+inet6num:           fdb0:4339:016a:0000:0000:0000:0000:0000 - fdb0:4339:016a:ffff:ffff:ffff:ffff:ffff
+netname:            NET6-IIIDEFIX-DERHR1-DN42
+descr:              iiidefix derhr1 prefix
+country:            DE
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
+mnt-by:             IIIDEFIX-MNT
+status:             ASSIGNED
+cidr:               fdb0:4339:16a::/48
+source:             DN42
diff --git a/data/inet6num/fdb0:4339:16c::_48 b/data/inet6num/fdb0:4339:16c::_48
new file mode 100644
index 000000000..15669be1a
--- /dev/null
+++ b/data/inet6num/fdb0:4339:16c::_48
@@ -0,0 +1,11 @@
+inet6num:           fdb0:4339:016c:0000:0000:0000:0000:0000 - fdb0:4339:016c:ffff:ffff:ffff:ffff:ffff
+netname:            NET6-IIIDEFIX-USLXA1-DN42
+descr:              iiidefix uslxa1 prefix
+country:            DE
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
+mnt-by:             IIIDEFIX-MNT
+status:             ASSIGNED
+cidr:               fdb0:4339:16c::/48
+source:             DN42
diff --git a/data/inet6num/fdb0:4339:1ff::_48 b/data/inet6num/fdb0:4339:1ff::_48
new file mode 100644
index 000000000..530ed0645
--- /dev/null
+++ b/data/inet6num/fdb0:4339:1ff::_48
@@ -0,0 +1,11 @@
+inet6num:           fdb0:4339:01ff:0000:0000:0000:0000:0000 - fdb0:4339:01ff:ffff:ffff:ffff:ffff:ffff
+netname:            NET6-IIIDEFIX-MULTI1-DN42
+descr:              iiidefix multicast 1 prefix
+country:            DE
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
+mnt-by:             IIIDEFIX-MNT
+status:             ASSIGNED
+cidr:               fdb0:4339:1ff::/48
+source:             DN42
diff --git a/data/inet6num/fdb0:4339:2aff::_48 b/data/inet6num/fdb0:4339:2aff::_48
new file mode 100644
index 000000000..ab7764279
--- /dev/null
+++ b/data/inet6num/fdb0:4339:2aff::_48
@@ -0,0 +1,11 @@
+inet6num:           fdb0:4339:2aff:0000:0000:0000:0000:0000 - fdb0:4339:2aff:ffff:ffff:ffff:ffff:ffff
+netname:            NET6-IIIDEFIX-MULTI42-DN42
+descr:              iiidefix multicast 42 prefix
+country:            DE
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
+mnt-by:             IIIDEFIX-MNT
+status:             ASSIGNED
+cidr:               fdb0:4339:2aff::/48
+source:             DN42
diff --git a/data/inet6num/fdb0:4339::_32 b/data/inet6num/fdb0:4339::_32
new file mode 100644
index 000000000..426a33ac9
--- /dev/null
+++ b/data/inet6num/fdb0:4339::_32
@@ -0,0 +1,12 @@
+inet6num:           fdb0:4339:0000:0000:0000:0000:0000:0000 - fdb0:4339:ffff:ffff:ffff:ffff:ffff:ffff
+netname:            NET6-IIIDEFIX-ULA-DN42
+descr:              iiidefix ULA prefix
+country:            DE
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
+mnt-by:             IIIDEFIX-MNT
+nserver:            ns1.iiidefix.dn42
+status:             ALLOCATED
+cidr:               fdb0:4339::/32
+source:             DN42
diff --git a/data/inet6num/fdb0:4339:ffff::_48 b/data/inet6num/fdb0:4339:ffff::_48
new file mode 100644
index 000000000..cfdcfe650
--- /dev/null
+++ b/data/inet6num/fdb0:4339:ffff::_48
@@ -0,0 +1,11 @@
+inet6num:           fdb0:4339:ffff:0000:0000:0000:0000:0000 - fdb0:4339:ffff:ffff:ffff:ffff:ffff:ffff
+netname:            NET6-IIIDEFIX-INFRA-DN42
+descr:              iiidefix infrastructure prefix
+country:            DE
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
+mnt-by:             IIIDEFIX-MNT
+status:             ASSIGNED
+cidr:               fdb0:4339:ffff::/48
+source:             DN42
diff --git a/data/inetnum/172.23.131.0_26 b/data/inetnum/172.23.131.0_26
new file mode 100644
index 000000000..bee350cc4
--- /dev/null
+++ b/data/inetnum/172.23.131.0_26
@@ -0,0 +1,12 @@
+inetnum:            172.23.131.0 - 172.23.131.63
+netname:            NET-IIIDEFIX-DN42
+descr:              Main range
+country:            DE
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
+mnt-by:             IIIDEFIX-MNT
+nserver:            ns1.iiidefix.dn42
+status:             ASSIGNED
+cidr:               172.23.131.0/26
+source:             DN42
diff --git a/data/organisation/ORG-IIIDEFIX b/data/organisation/ORG-IIIDEFIX
new file mode 100644
index 000000000..9ac6f5382
--- /dev/null
+++ b/data/organisation/ORG-IIIDEFIX
@@ -0,0 +1,17 @@
+organisation:       ORG-IIIDEFIX
+org-name:           iiidefix
+language:           DE
+remarks:            +- Welcome to ----------------------------------------+
+remarks:            |             _ _ _     _       __ _                  |
+remarks:            |            (_)_)_)   | |     / _)_)                 |
+remarks:            |             _ _ _  __| | ___| |_ _ _  _             |
+remarks:            |            | | | |/ _` |/ _ \  _) | \/ )            |
+remarks:            |            | | | | (_| |  __/ | | |)  (             |
+remarks:            |            |_|_|_|\__,_|\___)_| |_|_/\_)            |
+remarks:            |                                                     |
+remarks:            |     the independent intelligent interconnected      |
+remarks:            +- distribution environment for information eXchange -+
+admin-c:            IIIDEFIX-DN42
+tech-c:             IIIDEFIX-DN42
+mnt-by:             IIIDEFIX-MNT
+source:             DN42
diff --git a/data/person/IIIDEFIX-DN42 b/data/person/IIIDEFIX-DN42
index 83fdd8597..7f77b39bc 100644
--- a/data/person/IIIDEFIX-DN42
+++ b/data/person/IIIDEFIX-DN42
@@ -1,5 +1,6 @@
 person:             iiidefix
 contact:            dn42@iiidefix.net
 nic-hdl:            IIIDEFIX-DN42
+org:                ORG-IIIDEFIX
 mnt-by:             IIIDEFIX-MNT
 source:             DN42
diff --git a/data/route/172.23.131.0_26 b/data/route/172.23.131.0_26
new file mode 100644
index 000000000..c8c6d1295
--- /dev/null
+++ b/data/route/172.23.131.0_26
@@ -0,0 +1,4 @@
+route:              172.23.131.0/26
+origin:             AS4242422345
+mnt-by:             IIIDEFIX-MNT
+source:             DN42
diff --git a/data/route6/fdb0:4339::_32 b/data/route6/fdb0:4339::_32
new file mode 100644
index 000000000..5ba097196
--- /dev/null
+++ b/data/route6/fdb0:4339::_32
@@ -0,0 +1,4 @@
+route6:             fdb0:4339::/32
+origin:             AS4242422345
+mnt-by:             IIIDEFIX-MNT
+source:             DN42