diff --git a/data/aut-num/AS4242422092 b/data/aut-num/AS4242422092
index 7b3b0ab98..9b22634f2 100644
--- a/data/aut-num/AS4242422092
+++ b/data/aut-num/AS4242422092
@@ -1,6 +1,23 @@
 aut-num:            AS4242422092
-as-name:            AS for P3BK4C Network
+as-name:            P3BK4C DN42 Network
 admin-c:            P3BK4C-DN42
 tech-c:             P3BK4C-DN42
 mnt-by:             P3BK4C-MNT
+remarks:            -----------------------------------------------------
+remarks:            |                P3BK4C DN42 NETWORK                |
+remarks:            -----------------------------------------------------
+remarks:            |                                                   |
+remarks:            |  PEERING: OPEN (feel free to contact me)          |
+remarks:            |                                                   |
+remarks:            |  E-mail.........: dn42@pebkac.gr                  |
+remarks:            |  IRC............: tomkap                          |
+remarks:            |  Info...........: https://dn42.pebkac.gr/         |
+remarks:            |  Looking Glass..: https://dn42.pebkac.gr/lg/      |
+remarks:            |                                                   |
+remarks:            |---------------------------------------------------|
+remarks:            |                 Peering Locations                 |
+remarks:            |---------------------------------------------------|
+remarks:            |  EU: Athens, Greece                               |
+remarks:            |                                                   |
+remarks:            -----------------------------------------------------
 source:             DN42
diff --git a/data/dns/pebkac.dn42 b/data/dns/pebkac.dn42
new file mode 100644
index 000000000..81e7b51ba
--- /dev/null
+++ b/data/dns/pebkac.dn42
@@ -0,0 +1,9 @@
+domain:             pebkac.dn42
+admin-c:            P3BK4C-DN42
+tech-c:             P3BK4C-DN42
+mnt-by:             P3BK4C-MNT
+nserver:            ns1.pebkac.dn42 172.21.67.193
+nserver:            ns1.pebkac.dn42 fd63:672f:38e7:53::1
+nserver:            ns2.pebkac.dn42 172.21.67.194
+nserver:            ns2.pebkac.dn42 fd63:672f:38e7:53::1
+source:             DN42
diff --git a/data/inet6num/fd63:672f:38e7::_48 b/data/inet6num/fd63:672f:38e7::_48
index 4458b5484..14f03f6fe 100644
--- a/data/inet6num/fd63:672f:38e7::_48
+++ b/data/inet6num/fd63:672f:38e7::_48
@@ -1,10 +1,12 @@
 inet6num:           fd63:672f:38e7:0000:0000:0000:0000:0000 - fd63:672f:38e7:ffff:ffff:ffff:ffff:ffff
 cidr:               fd63:672f:38e7::/48
-netname:            P3BK4C-NETWORK
-descr:              Network of P3BK4C
+netname:            NET-P3BK4C-V6-000
+descr:              P3BK4C IPv6 Network
 country:            GR
 admin-c:            P3BK4C-DN42
 tech-c:             P3BK4C-DN42
 mnt-by:             P3BK4C-MNT
+nserver:            ns1.pebkac.dn42
+nserver:            ns2.pebkac.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.21.67.192_27 b/data/inetnum/172.21.67.192_27
index 8e634cb86..14d38eecb 100644
--- a/data/inetnum/172.21.67.192_27
+++ b/data/inetnum/172.21.67.192_27
@@ -1,8 +1,11 @@
 inetnum:            172.21.67.192 - 172.21.67.223
 cidr:               172.21.67.192/27
-netname:            P3BK4C-NETWORK
+netname:            NET-P3BK4C-000
+country:            GR
 admin-c:            P3BK4C-DN42
 tech-c:             P3BK4C-DN42
 mnt-by:             P3BK4C-MNT
+nserver:            ns1.pebkac.dn42
+nserver:            ns2.pebkac.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/person/P3BK4C-DN42 b/data/person/P3BK4C-DN42
index d4890bcae..f30d91cdb 100644
--- a/data/person/P3BK4C-DN42
+++ b/data/person/P3BK4C-DN42
@@ -1,4 +1,4 @@
-person:             Thomas Kay
+person:             Thomas K.
 contact:            dn42@pebkac.gr
 nic-hdl:            P3BK4C-DN42
 mnt-by:             P3BK4C-MNT
diff --git a/data/route/172.21.67.192_27 b/data/route/172.21.67.192_27
index f3647d9e7..2a5da495c 100644
--- a/data/route/172.21.67.192_27
+++ b/data/route/172.21.67.192_27
@@ -1,4 +1,5 @@
 route:              172.21.67.192/27
+descr:              NET-P3BK4C-000
 origin:             AS4242422092
 mnt-by:             P3BK4C-MNT
 source:             DN42
diff --git a/data/route6/fd63:672f:38e7::_48 b/data/route6/fd63:672f:38e7::_48
index 77b937c81..e20f70963 100644
--- a/data/route6/fd63:672f:38e7::_48
+++ b/data/route6/fd63:672f:38e7::_48
@@ -1,4 +1,5 @@
 route6:             fd63:672f:38e7::/48
+descr:              NET-P3BK4C-V6-000
 origin:             AS4242422092
 max-length:         48
 mnt-by:             P3BK4C-MNT