diff --git a/classes/CsvxmlAvailableFields.php b/classes/CsvxmlAvailableFields.php
index 5cb51c6..ee6196a 100644
--- a/classes/CsvxmlAvailableFields.php
+++ b/classes/CsvxmlAvailableFields.php
@@ -56,7 +56,6 @@ final class CsvxmlAvailableFields {
     /**
      * Function for building a generic event type definition.
      *
-     * @param string[]   $event    Translation variable.
      * @param MDTlLoader $tlLoader Translation loader.
      * @param string     $typeName Translated name of event type.
      * @param string     $type     Event type name (e.g. production).
@@ -64,17 +63,17 @@ final class CsvxmlAvailableFields {
      *
      * @return FieldEntry
      */
-    private function _generateGenericFullEvent(array $event, MDTlLoader $tlLoader, string $typeName, string $type, int $number):array {
+    private function _generateGenericFullEvent(MDTlLoader $tlLoader, string $typeName, string $type, int $number):array {
 
         return [
-            "{$type}_when{$number}"         => $this->_getSimpleAvailableFieldEntry("{$typeName}: {$event['when']}", "", ["{$type}_when_sure{$number}"]),
-            "{$type}_when_sure{$number}"    => $this->_getSimpleAvailableFieldEntry("{$typeName}: {$event['when']} [" . $tlLoader->tl('csvxml-overview', 'csvxml_overview', 'certainty') . "]", "", ["{$type}_when{$number}"], ["y", "n"]),
-            "{$type}_who{$number}"          => $this->_getSimpleAvailableFieldEntry("{$typeName}: {$event['who']}", "", ["{$type}_who_sure{$number}"]),
-            "{$type}_who_sure{$number}"     => $this->_getSimpleAvailableFieldEntry("{$typeName}: {$event['who']} [" . $tlLoader->tl('csvxml-overview', 'csvxml_overview', 'certainty') . "]", "", ["{$type}_who{$number}"], ["y", "n"]),
-            "{$type}_who_gnd{$number}"      => $this->_getSimpleAvailableFieldEntry("{$typeName}: {$event['who']} ({$event['gnd']})", "", ["{$type}_who_sure{$number}", "{$type}_who{$number}"]),
-            "{$type}_where{$number}"        => $this->_getSimpleAvailableFieldEntry("{$typeName}: {$event['where']}", "", ["{$type}_where_sure{$number}"]),
-            "{$type}_where_sure{$number}"   => $this->_getSimpleAvailableFieldEntry("{$typeName}: {$event['where']} [" . $tlLoader->tl('csvxml-overview', 'csvxml_overview', 'certainty') . "]", "", ["{$type}_where{$number}"], ["y", "n"]),
-            "{$type}_annotation{$number}"   => $this->_getSimpleAvailableFieldEntry("{$typeName}: {$event['classic_annotation_intro']}", ""),
+            $type . '_when' . $number         => $this->_getSimpleAvailableFieldEntry($typeName . ': ' . $tlLoader->tl("event", "event", 'when'), "", [$type . '_when_sure' . $number]),
+            $type . '_when_sure' . $number    => $this->_getSimpleAvailableFieldEntry($typeName . ': ' . $tlLoader->tl("event", "event", 'when') . " [" . $tlLoader->tl('csvxml-overview', 'csvxml_overview', 'certainty') . "]", "", [$type . '_when' . $number], ["y", "n"]),
+            $type . '_who' . $number          => $this->_getSimpleAvailableFieldEntry($typeName . ': ' . $tlLoader->tl("event", "event", 'who'), "", [$type . '_who_sure' . $number]),
+            $type . '_who_sure' . $number     => $this->_getSimpleAvailableFieldEntry($typeName . ': ' . $tlLoader->tl("event", "event", 'who') . " [" . $tlLoader->tl('csvxml-overview', 'csvxml_overview', 'certainty') . "]", "", [$type . '_who' . $number], ["y", "n"]),
+            $type . '_who_gnd' . $number      => $this->_getSimpleAvailableFieldEntry($typeName . ': ' . $tlLoader->tl("event", "event", 'who') . ' (' . $tlLoader->tl("event", "event", 'gnd') . ')', "", [$type . '_who_sure' . $number, $type . '_who' . $number]),
+            $type . '_where' . $number        => $this->_getSimpleAvailableFieldEntry($typeName . ': ' . $tlLoader->tl("event", "event", 'where'), "", [$type . '_where_sure' . $number]),
+            $type . '_where_sure' . $number   => $this->_getSimpleAvailableFieldEntry($typeName . ': ' . $tlLoader->tl("event", "event", 'where') . " [" . $tlLoader->tl('csvxml-overview', 'csvxml_overview', 'certainty') . "]", "", [$type . '_where' . $number], ["y", "n"]),
+            $type . '_annotation' . $number   => $this->_getSimpleAvailableFieldEntry($typeName . ': ' . $tlLoader->tl("event", "event", 'classic_annotation_intro'), ""),
         ];
 
     }
@@ -881,6 +880,13 @@ final class CsvxmlAvailableFields {
             $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "35") => [],
             $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "37") => [],
             $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "38") => [],
+            $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "39") => [],
+            $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "40") => [],
+            $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "44") => [],
+            $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "45") => [],
+            $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "46") => [],
+            $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "47") => [],
+            $tlLoader->tl("basis", "basis", 'event') . ": " . $tlLoader->tl("eventtype_name", "eventname", "48") => [],
         ];
 
         /*
@@ -1436,28 +1442,28 @@ final class CsvxmlAvailableFields {
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "1")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "1")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "1"), "production", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "1"), "production", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "2")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "2")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "2"), "finding", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "2"), "finding", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "3")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "3")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "3"), "publication", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "3"), "publication", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "4")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "4")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "4"), "template_creation", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "4"), "template_creation", $i)
             );
         }
 
@@ -1516,182 +1522,233 @@ final class CsvxmlAvailableFields {
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "6")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "6")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "6"), "was_used", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "6"), "was_used", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "7")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "7")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "7"), "written", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "7"), "written", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "8")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "8")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "8"), "collected", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "8"), "collected", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "9")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "9")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "9"), "painted", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "9"), "painted", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "10")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "10")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "10"), "taken", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "10"), "taken", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "11")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "11")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "11"), "received", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "11"), "received", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "12")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "12")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "12"), "printing_plate_produced", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "12"), "printing_plate_produced", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "13")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "13")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "13"), "sent", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "13"), "sent", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "14")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "14")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "14"), "issued", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "14"), "issued", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "15")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "15")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "15"), "signed", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "15"), "signed", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "16")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "16")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "16"), "type_described", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "16"), "type_described", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "19")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "19")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "19"), "drawn", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "19"), "drawn", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "20")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "20")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "20"), "copied", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "20"), "copied", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "25")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "25")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "25"), "commissioned", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "25"), "commissioned", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "26")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "26")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "26"), "printed", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "26"), "printed", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "27")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "27")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "27"), "spoken", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "27"), "spoken", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $eventname[28]] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $eventname[28]],
-                $this->_generateGenericFullEvent($event, $tlLoader, $eventname[28], "sung", $i)
+                $this->_generateGenericFullEvent($tlLoader, $eventname[28], "sung", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "29")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "29")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "29"), "decor_designed", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "29"), "decor_designed", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "30")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "30")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "30"), "form_designed", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "30"), "form_designed", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "31")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "31")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "31"), "modelled", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "31"), "modelled", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "32")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "32")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "32"), "signed_artwork", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "32"), "signed_artwork", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "33")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "33")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "33"), "was_mentioned", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "33"), "was_mentioned", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "34")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "34")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "34"), "buried", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "34"), "buried", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "35")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "35")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "35"), "intellectual_creation", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "35"), "intellectual_creation", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "37")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "37")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "37"), "painted_on", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "37"), "painted_on", $i)
             );
         }
 
         for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
             $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "38")] = array_merge(
                 $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "38")],
-                $this->_generateGenericFullEvent($event, $tlLoader, $tlLoader->tl("eventtype_name", "eventname", "38"), "illustrated", $i)
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "38"), "illustrated", $i)
+            );
+        }
+
+        for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
+            $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "39")] = array_merge(
+                $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "39")],
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "39"), "assembled", $i)
+            );
+        }
+
+        for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
+            $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "40")] = array_merge(
+                $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "40")],
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "40"), "auctioned", $i)
+            );
+        }
+
+        // 41: Bought, and 42: Owned, and 43: Sold are skipped for now
+
+        for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
+            $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "44")] = array_merge(
+                $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "44")],
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "44"), "restorated", $i)
+            );
+        }
+
+        for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
+            $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "45")] = array_merge(
+                $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "45")],
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "45"), "damaged", $i)
+            );
+        }
+
+        for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
+            $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "46")] = array_merge(
+                $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "46")],
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "46"), "destroyed", $i)
+            );
+        }
+
+        for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
+            $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "47")] = array_merge(
+                $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "47")],
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "47"), "lost", $i)
+            );
+        }
+
+        for ($i = 1; $i <= self::EVENT_MULTIPLIER * $fieldNoMultiplicator; $i++) {
+            $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "48")] = array_merge(
+                $availableFields[$tlLoader->tl("basis", "basis", 'event') . ': ' . $tlLoader->tl("eventtype_name", "eventname", "48")],
+                $this->_generateGenericFullEvent($tlLoader, $tlLoader->tl("eventtype_name", "eventname", "48"), "edited", $i)
             );
         }
 
diff --git a/classes/MD_STD b/classes/MD_STD
index 6a7b8bd..c362aa1 160000
--- a/classes/MD_STD
+++ b/classes/MD_STD
@@ -1 +1 @@
-Subproject commit 6a7b8bd8fdef418f11b2fe8f164a5ea9643eb091
+Subproject commit c362aa128337837ab2930526d154eca4900a2dea