diff --git a/data/aut-num/AS4242422761 b/data/aut-num/AS4242422761
index 2454af83f..2ddd444f0 100644
--- a/data/aut-num/AS4242422761
+++ b/data/aut-num/AS4242422761
@@ -3,5 +3,4 @@ as-name:            Arg Network
 admin-c:            ARG-DN42
 tech-c:             ARG-DN42
 mnt-by:             ARG-MNT
-org:                ORG-ARG
 source:             DN42
diff --git a/data/dns/arg.dn42 b/data/dns/arg.dn42
new file mode 100644
index 000000000..dbbe030d7
--- /dev/null
+++ b/data/dns/arg.dn42
@@ -0,0 +1,7 @@
+domain:             arg.dn42
+admin-c:            ARG-DN42
+tech-c:             ARG-DN42
+mnt-by:             ARG-MNT
+nserver:            ns.nia.dn42 172.20.158.129
+nserver:            ns.nia.dn42 fd00:1926:817:53::1
+source:             DN42
diff --git a/data/inet6num/fd00:1953:615::_48 b/data/inet6num/fd00:1953:615::_48
index b2fd35deb..f95328aa1 100644
--- a/data/inet6num/fd00:1953:615::_48
+++ b/data/inet6num/fd00:1953:615::_48
@@ -5,7 +5,7 @@ descr:              Core IPv6 Network of Arg Network
 country:            CN
 admin-c:            ARG-DN42
 tech-c:             ARG-DN42
-org:                ORG-ARG
 mnt-by:             ARG-MNT
+nserver:            ns.nia.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.23.104.64_27 b/data/inetnum/172.23.104.64_27
index 22710e9f7..9d9b899a1 100644
--- a/data/inetnum/172.23.104.64_27
+++ b/data/inetnum/172.23.104.64_27
@@ -1,9 +1,9 @@
 inetnum:            172.23.104.64 - 172.23.104.95
 cidr:               172.23.104.64/27
 netname:            Arg Network Core
-org:                ORG-ARG
 admin-c:            ARG-DN42
 tech-c:             ARG-DN42
+nserver:            ns.nia.dn42
 mnt-by:             ARG-MNT
 status:             ASSIGNED
 source:             DN42
diff --git a/data/mntner/ARG-MNT b/data/mntner/ARG-MNT
index 36b6ce0bb..47342d269 100644
--- a/data/mntner/ARG-MNT
+++ b/data/mntner/ARG-MNT
@@ -4,4 +4,4 @@ admin-c:            ARG-DN42
 tech-c:             ARG-DN42
 mnt-by:             ARG-MNT
 source:             DN42
-auth:               pgp-fingerprint 8DC6E09C30441D5F
+auth:               pgp-fingerprint BDF14A59875B117B6FFCD55C8DC6E09C30441D5F
diff --git a/data/organisation/ORG-ARG b/data/organisation/ORG-ARG
deleted file mode 100644
index cec95a13d..000000000
--- a/data/organisation/ORG-ARG
+++ /dev/null
@@ -1,6 +0,0 @@
-organisation:       ORG-ARG
-org-name:           Argon Network
-admin-c:            ARG-DN42
-tech-c:             ARG-DN42
-mnt-by:             ARG-MNT
-source:             DN42