diff --git a/data/aut-num/AS4242422770 b/data/aut-num/AS4242422770
index 1dc191e31..982d9c3db 100644
--- a/data/aut-num/AS4242422770
+++ b/data/aut-num/AS4242422770
@@ -3,6 +3,6 @@ as-name:            YTTRIUM-AS
 descr:              hixady's personal AS
 admin-c:            HIXADY-DN42
 tech-c:             HIXADY-DN42
-remarks:            Peering - vk.com/hixady (Location - Novosibirsk, Manual Peering)
+remarks:            Contact - @hixady:mozilla.org (matrix)
 mnt-by:             HIXADY-MNT
 source:             DN42
diff --git a/data/aut-num/AS4242423242 b/data/aut-num/AS4242423242
new file mode 100644
index 000000000..95f0bf17a
--- /dev/null
+++ b/data/aut-num/AS4242423242
@@ -0,0 +1,6 @@
+aut-num:            AS4242423242
+as-name:            AS-TYALMA-DN42
+admin-c:            TYALMA-DN42
+tech-c:             TYALMA-DN42
+mnt-by:             TYALMA-MNT
+source:             DN42
diff --git a/data/dns/yobanirot.dn42 b/data/dns/yobanirot.dn42
new file mode 100644
index 000000000..cd131daa4
--- /dev/null
+++ b/data/dns/yobanirot.dn42
@@ -0,0 +1,7 @@
+domain:             yobanirot.dn42
+admin-c:            NAAIN-DN42
+tech-c:             NAAIN-DN42
+mnt-by:             NAAIN-MNT
+nserver:            ns1.yobanirot.dn42 172.21.99.81
+nserver:            ns1.yobanirot.dn42 fdd0:f8f8:a076::1
+source:             DN42
diff --git a/data/filter.txt b/data/filter.txt
index b3f5eb8db..3d6c49fcc 100644
--- a/data/filter.txt
+++ b/data/filter.txt
@@ -11,7 +11,7 @@
 #       sed "$ s/,$/\n  ];\n}/"
 
 # The rules MUST be sorted by the number column first and then the first matching rule MUST be used.
-# ROAs MUST be checked against these rules and max-length of the ROA NUST NOT be longer than allowed by the matching rule.
+# ROAs MUST be checked against these rules and max-length of the ROA MUST NOT be longer than allowed by the matching rule.
 
 #Nr   Action  Prefix           MinLen  MaxLen  # Comment
 
diff --git a/data/filter6.txt b/data/filter6.txt
index 989244f28..270ed12f2 100644
--- a/data/filter6.txt
+++ b/data/filter6.txt
@@ -1,17 +1,17 @@
-# To FRR Rules:
+# For FRR Rules:
 #   cat filter6.txt | \
 #       grep -e  ^[0-9] | \
-#       awk '{ print "ipv prefix-list dn42v6-in seq " $1 " " $2 " " $3 " ge " $4 " le " $5}' | \
+#       awk '{ print "ipv6 prefix-list dn42v6-in seq " $1 " " $2 " " $3 " ge " $4 " le " $5}' | \
 #       sed "s_/\([0-9]\+\) ge \1_/\1_g;s_/\([0-9]\+\) le \1_/\1_g"
 #
 # For BIRD Rules:
 #   cat filter6.txt | \
-#       awk 'BEGIN {printf "function is_valid_network() {\n return net ~ [\n" } \
+#       awk 'BEGIN {printf "function is_valid_network_v6() {\n return net ~ [\n" } \
 #            /^[0-9]/ && $2 ~ /permit/ {printf "     %s{%s,%s},\n", $3, $4, $5};' | \
 #       sed "$ s/,$/\n  ];\n}/"
 
 # The rules MUST be sorted by the number column first and then the first matching rule MUST be used.
-# ROAs MUST be checked against these rules and max-length of the ROA NUST NOT be longer than allowed by the matching rule.
+# ROAs MUST be checked against these rules and max-length of the ROA MUST NOT be longer than allowed by the matching rule.
 
 # Nr    Action    Prefix                      MinLen  MaxLen    # Comment
 
diff --git a/data/inet6num/fd1a:6295:5133::_48 b/data/inet6num/fd1a:6295:5133::_48
new file mode 100644
index 000000000..b22b468be
--- /dev/null
+++ b/data/inet6num/fd1a:6295:5133::_48
@@ -0,0 +1,10 @@
+inet6num:           fd1a:6295:5133:0000:0000:0000:0000:0000 - fd1a:6295:5133:ffff:ffff:ffff:ffff:ffff
+cidr:               fd1a:6295:5133::/48
+netname:            hackint matrix subnet
+org:                ORG-HACKINT
+admin-c:            HACKINT-DN42
+tech-c:             HACKINT-DN42
+remarks:            hackint uses this for mapping matrix users, do not edit!
+mnt-by:             DN42-MNT
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inet6num/fdd0:f8f8:a076::_48 b/data/inet6num/fdd0:f8f8:a076::_48
index 490c25a3c..dd6b3de88 100644
--- a/data/inet6num/fdd0:f8f8:a076::_48
+++ b/data/inet6num/fdd0:f8f8:a076::_48
@@ -8,3 +8,4 @@ tech-c:             NAAIN-DN42
 mnt-by:             NAAIN-MNT
 status:             ASSIGNED
 source:             DN42
+nserver:            ns1.yobanirot.dn42
diff --git a/data/inet6num/fdff:d7b0:4864::_48 b/data/inet6num/fdff:d7b0:4864::_48
new file mode 100644
index 000000000..da4168b99
--- /dev/null
+++ b/data/inet6num/fdff:d7b0:4864::_48
@@ -0,0 +1,9 @@
+inet6num:           fdff:d7b0:4864:0000:0000:0000:0000:0000 - fdff:d7b0:4864:ffff:ffff:ffff:ffff:ffff
+cidr:               fdff:d7b0:4864::/48
+netname:            TYALMA-NETWORK
+descr:              Network of TYALMA
+admin-c:            TYALMA-DN42
+tech-c:             TYALMA-DN42
+mnt-by:             TYALMA-MNT
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inetnum/172.20.41.0_27 b/data/inetnum/172.20.41.0_27
new file mode 100644
index 000000000..b69d55151
--- /dev/null
+++ b/data/inetnum/172.20.41.0_27
@@ -0,0 +1,9 @@
+inetnum:            172.20.41.0 - 172.20.41.31
+cidr:               172.20.41.0/27
+netname:            TYALMA-NETWORK
+descr:              Network of TYALMA
+admin-c:            TYALMA-DN42
+tech-c:             TYALMA-DN42
+mnt-by:             TYALMA-MNT
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inetnum/172.21.99.80_29 b/data/inetnum/172.21.99.80_29
index 32cf4f0e0..014a3014b 100644
--- a/data/inetnum/172.21.99.80_29
+++ b/data/inetnum/172.21.99.80_29
@@ -8,3 +8,4 @@ tech-c:             NAAIN-DN42
 mnt-by:             NAAIN-MNT
 status:             ASSIGNED
 source:             DN42
+nserver:            ns1.yobanirot.dn42
diff --git a/data/mntner/TYALMA-MNT b/data/mntner/TYALMA-MNT
new file mode 100644
index 000000000..6b45f1557
--- /dev/null
+++ b/data/mntner/TYALMA-MNT
@@ -0,0 +1,6 @@
+mntner:             TYALMA-MNT
+admin-c:            TYALMA-DN42
+tech-c:             TYALMA-DN42
+mnt-by:             TYALMA-MNT
+auth:               pgp-fingerprint BD7CEFE6FF1DA4084DCCD4BB7F434DB71B0F65D5
+source:             DN42
diff --git a/data/organisation/ORG-HACKINT b/data/organisation/ORG-HACKINT
new file mode 100644
index 000000000..7a019e59c
--- /dev/null
+++ b/data/organisation/ORG-HACKINT
@@ -0,0 +1,9 @@
+organisation:       ORG-HACKINT
+org-name:           hackint
+e-mail:             mail@hackint.org
+www:                hackint.org
+descr:              hackint - org object for hackint irc network
+admin-c:            HACKINT-DN42
+tech-c:             HACKINT-DN42
+mnt-by:             DN42-MNT
+source:             DN42
diff --git a/data/person/HACKINT-DN42 b/data/person/HACKINT-DN42
new file mode 100644
index 000000000..938b93f28
--- /dev/null
+++ b/data/person/HACKINT-DN42
@@ -0,0 +1,7 @@
+person:             HACKINT
+e-mail:             mail@hackint.net
+contact:            #hackint@hackint
+remarks:            this is a dummy person representing hackint, any changes to objects related to hackint should be verified to come from hackint staff
+nic-hdl:            HACKINT-DN42
+mnt-by:             DN42-MNT
+source:             DN42
diff --git a/data/person/TYALMA-DN42 b/data/person/TYALMA-DN42
new file mode 100644
index 000000000..c8711beb7
--- /dev/null
+++ b/data/person/TYALMA-DN42
@@ -0,0 +1,4 @@
+person:             Tyalma
+nic-hdl:            TYALMA-DN42
+mnt-by:             TYALMA-MNT
+source:             DN42
diff --git a/data/route/172.20.41.0_27 b/data/route/172.20.41.0_27
new file mode 100644
index 000000000..7b629c1db
--- /dev/null
+++ b/data/route/172.20.41.0_27
@@ -0,0 +1,5 @@
+route:              172.20.41.0/27
+origin:             AS4242423242
+max-length:         27
+mnt-by:             TYALMA-MNT
+source:             DN42
diff --git a/data/route6/fd1a:6295:5133::_48 b/data/route6/fd1a:6295:5133::_48
new file mode 100644
index 000000000..d75ec44bc
--- /dev/null
+++ b/data/route6/fd1a:6295:5133::_48
@@ -0,0 +1,7 @@
+route6:             fd1a:6295:5133::/48
+descr:              hackint uses this for mapping matrix users, do not edit!
+origin:             AS0
+admin-c:            HACKINT-DN42
+tech-c:             HACKINT-DN42
+mnt-by:             DN42-MNT
+source:             DN42
diff --git a/data/route6/fdff:d7b0:4864::_48 b/data/route6/fdff:d7b0:4864::_48
new file mode 100644
index 000000000..9c62e9fbc
--- /dev/null
+++ b/data/route6/fdff:d7b0:4864::_48
@@ -0,0 +1,5 @@
+route6:             fdff:d7b0:4864::/48
+origin:             AS4242423242
+max-length:         48
+mnt-by:             TYALMA-MNT
+source:             DN42