diff --git a/data/aut-num/AS4242420980 b/data/aut-num/AS4242420980
index 922fbf8c8..49f879645 100644
--- a/data/aut-num/AS4242420980
+++ b/data/aut-num/AS4242420980
@@ -1,6 +1,6 @@
-aut-num: AS4242420980
-as-name: FOOBARS
-admin-c: FOOBARS-DN42
-tech-c:  FOOBARS-DN42
-mnt-by:  FOOBARS-MNT
-source: DN42
+aut-num:            AS4242420980
+as-name:            FOOBARS
+admin-c:            FOOBARS-DN42
+tech-c:             FOOBARS-DN42
+mnt-by:             FOOBARS-MNT
+source:             DN42
diff --git a/data/inet6num/fd59:a9db:1a5e:0670::_64 b/data/inet6num/fd59:a9db:1a5e:0670::_64
new file mode 100644
index 000000000..e645f9dd9
--- /dev/null
+++ b/data/inet6num/fd59:a9db:1a5e:0670::_64
@@ -0,0 +1,12 @@
+inet6num:           fd59:a9db:1a5e:0670:0000:0000:0000:0000 - fd59:a9db:1a5e:0670:ffff:ffff:ffff:ffff
+cidr:               fd59:a9db:1a5e:0670::/64
+netname:            FOOBARS
+descr:              FOOBARS IPv6
+country:            NL
+admin-c:            FOOBARS-DN42
+tech-c:             FOOBARS-DN42
+mnt-by:             FOOBARS-MNT
+nserver:            ns1.foobars.dn42
+nserver:            ns2.foobars.dn42
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inetnum/172.23.100.0_25 b/data/inetnum/172.23.100.0_25
index 8f37c456a..53393f26b 100644
--- a/data/inetnum/172.23.100.0_25
+++ b/data/inetnum/172.23.100.0_25
@@ -1,10 +1,10 @@
-inetnum: 172.23.100.0 - 172.23.100.127
-cidr: 172.23.100.0/25
-netname: FOOBARS
-admin-c: FOOBARS-DN42
-tech-c: FOOBARS-DN42
-mnt-by: FOOBARS-MNT
-nserver: ns1.foobars.dn42
-nserver: ns2.foobars.dn42
-status:  ASSIGNED
-source: DN42
+inetnum:            172.23.100.0 - 172.23.100.127
+cidr:               172.23.100.0/25
+netname:            FOOBARS
+admin-c:            FOOBARS-DN42
+tech-c:             FOOBARS-DN42
+mnt-by:             FOOBARS-MNT
+nserver:            ns1.foobars.dn42
+nserver:            ns2.foobars.dn42
+status:             ASSIGNED
+source:             DN42
diff --git a/data/mntner/FOOBARS-MNT b/data/mntner/FOOBARS-MNT
index 26fb2b1e0..b2135b8dc 100644
--- a/data/mntner/FOOBARS-MNT
+++ b/data/mntner/FOOBARS-MNT
@@ -1,5 +1,6 @@
-mntner: FOOBARS-MNT
-admin-c: FOOBARS-DN42
-tech-c: FOOBARS-DN42
-mnt-by: FOOBARS-MNT
-source: DN42
+mntner:             FOOBARS-MNT
+admin-c:            FOOBARS-DN42
+tech-c:             FOOBARS-DN42
+mnt-by:             FOOBARS-MNT
+source:             DN42
+auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBCJO3GAHWtA98rse7c7hpHS9vDPJUtGatu/x2fx9cHyfSwX8aVUcA2fTrcn4TG1F/rx9cAF1uKuUR3dTR1CV73e4wwTulugTK4rKizpO92PnUQBJ4o4C7tL8GLG3eJuy7gYFUKtJtwHV7msOA8AJshbtN6DGKvm821SMCX2XlrHB4pMzB0mjV5RIfkRzy4b323e64SXN8a6yfI1aGDi4hh7gBYK0KZxUTqsTSq4yCHNbAN/r7nmoEIzsTgoPLfnpxCi2rO/sz3miejXzgR5jF+PnfE5fqHBkEzRe9ugWIEmaIU1qmdoBpvATffYHkSo3aetnLlBzu/VFyhJM0sokN foo@foo
diff --git a/data/organisation/ORG-FOOORG b/data/organisation/ORG-FOOORG
deleted file mode 100644
index 3cecad046..000000000
--- a/data/organisation/ORG-FOOORG
+++ /dev/null
@@ -1,6 +0,0 @@
-organisation:   ORG-FOOORG
-org-name:       Foo Organisation
-admin-c:        FOOBARS-DN42
-tech-c:         FOOBARS-DN42
-mnt-by:         FOOBARS-MNT
-source:		DN42
diff --git a/data/route/172.23.100.0_25 b/data/route/172.23.100.0_25
index 1256fd894..c88339f2f 100644
--- a/data/route/172.23.100.0_25
+++ b/data/route/172.23.100.0_25
@@ -1,4 +1,4 @@
-route: 172.23.100.0/25
-origin: AS4242420980
-mnt-by: FOOBARS-MNT
-source: DN42
+route:              172.23.100.0/25
+origin:             AS4242420980
+mnt-by:             FOOBARS-MNT
+source:             DN42
diff --git a/data/route6/fd59:a9db:1a5e:0670::_64 b/data/route6/fd59:a9db:1a5e:0670::_64
new file mode 100644
index 000000000..44334cca8
--- /dev/null
+++ b/data/route6/fd59:a9db:1a5e:0670::_64
@@ -0,0 +1,3 @@
+route6:             fd59:a9db:1a5e:0670::_64
+origin:             AS4242420980
+mnt-bt:             FOOBARS-MNT