diff --git a/deploy_mediaconch/add_dnx_mappings/add_dnx_mappings.pl b/deploy_mediaconch/add_dnx_mappings/add_dnx_mappings.pl
index 37dd934db14be712dd2d97a199669db1c257867e..cc65d341b72e691676ca98321699f70378314132 100644
--- a/deploy_mediaconch/add_dnx_mappings/add_dnx_mappings.pl
+++ b/deploy_mediaconch/add_dnx_mappings/add_dnx_mappings.pl
@@ -27,39 +27,112 @@ my $institution = shift;
 my $ui_port = shift;
 my $protocol = 'https';
 my %mediainfo2dnx = (
-    "ICC-header:ColorSpaceData" => "icc.colorspacedata",
-    "ICC-header:DeviceModel" => "icc.devicemodel",
-    "ICC-header:PrimaryPlatform" => "icc.primaryplatform",
-    "ICC-header:ProfileCMMType" => "icc.profilecmmtype",
-    "ICC-header:ProfileCreator" => "icc.profilecreator",
-    "ICC-header:ProfileDateTime" => "icc.profiledatetime",
-    "ICC-header:ProfileVersion" => "icc.profileversion",
-    "ICC_Profile:CalibrationDateTime" => "icc.profilecalibrationdatetime",
-    "ICC_Profile:MakeAndModel" => "icc.makeandmodel",
-    "ICC_Profile:ProfileCopyright" => "icc.profilecopyright",
-    "ICC_Profile:ProfileDescription" => "icc.profiledescription",
-    "IFD0:BitsPerSample" => "tiff.bitspersample", # TIFF-Tag 258 BitsPerSample ()
-    "IFD0:Compression" => "tiff.compression",
-    "IFD0:Copyright" => "tiff.copyright", # TIFF-Tag 33432 Copyright ()
-    "IFD0:DocumentName" => "tiff.documentname", # TIFF-Tag 269 DocumentName ()
-    "ExifIFD:GrayResponseCurve" => "tiff.grayresponsecurve", # TIFF-Tag 291 GrayResponseCurve ()
-    "IFD0:GrayResponseUnit" => "tiff.grayresponseunit", # TIFF-Tag 290 GrayResponseUnit ()
-    "IFD0:ImageDescription" => "tiff.imagedescription", # TIFF-Tag 270 ImageDescription ()
-    "IFD0:ImageHeight" => "image.height", # TIFF-Tag 257 ImageLength ()
-    "IFD0:ImageWidth" => "image.width", # TIFF-Tag 256 ImageWidth (  )
-    "IFD0:Make" => "tiff.make", # TIFF-Tag 271 Make ()
-    "IFD0:MaxSampleValue" => "tiff.maxsamplevalue", # TIFF-Tag 281 MaxSampleValue ( )
-    "IFD0:MinSampleValue" => "tiff.minsamplevalue", # TIFF-Tag 280 MinSampleValue ( )
-    "IFD0:Model" => "tiff.model", # TIFF-Tag 272 Model ()
-    "IFD0:ModifyDate" => "tiff.datetime", # TIFF-Tag 306 DateTime ()
-    "IFD0:PageNumber" => "tiff.pagenumber", # TIFF-Tag 297 PageNumber ()
-    "IFD0:PhotometricInterpretation" => "tiff.photometricinterpretation", # TIFF-Tag 262 PhotometricInterpretation ()
-    "IFD0:PrimaryChromaticities" => "tiff.primarychromaticities", # TIFF-Tag 319 PrimaryChromaticities ()
-    "IFD0:SamplesPerPixel" => "tiff.samplesperpixel", # TIFF-Tag 277 SamplesPerPixel ()
-    "IFD0:Software" => "tiff.software", # TIFF-Tag 305 Software ()
-    "IFD0:WhitePoint" => "tiff.whitepoint", # TIFF-Tag 318 WhitePoint ()
-    "IFD0:XResolution" => "image.xresolution", # TIFF-Tag 282 XResolution ( Angabe in dpi)
-    "IFD0:YResolution" => "image.yresolution", # TIFF-Tag 283 YResolution ( Angabe in dpi)
+    "mediainfo.track.Audio.BitDepth"                          => "audio.bit_depth",
+    "mediainfo.track.Audio.BitRate"                           => "audio.bit_rate",
+    "mediainfo.track.Audio.BitRate_Mode"                      => "audio.bit_rate_mode",
+    "mediainfo.track.Audio.Channels"                          => "audio.channel_s_",
+    "mediainfo.track.Audio.CodecID"                           => "audio.codec_ID",
+    "mediainfo.track.Audio.Commercial_Name"                   => "audio.commercial_name",
+    "mediainfo.track.Audio.Compression_Mode"                  => "audio.compression_mode",
+    "mediainfo.track.Audio.Default"                           => "audio.default",
+    "mediainfo.track.Audio.Duration"                          => "audio.duration",
+    "mediainfo.track.Audio.encoded_library"                   => "audio.encoded_library",
+    "mediainfo.track.Audio.Forced"                            => "audio.forced",
+    "mediainfo.track.Audio.Format"                            => "audio.format",
+    "mediainfo.track.Audio.Format_Profile"                    => "audio.format_profile",
+    # "mediainfo.track.Audio.Format_Settings_Sign"              => "audio.format_settings_sign",  # not in FL
+    "mediainfo.track.Audio.Format_Settings_Wrapping"          => "audio.format_Settings_Wrapping",
+    "mediainfo.track.Audio.Format_Version"                    => "audio.format_version",
+    "mediainfo.track.Audio.FrameRate"                         => "audio.frame_rate",
+    "mediainfo.track.Audio.ID"                                => "audio.ID",
+    "mediainfo.track.Audio.SamplingRate"                      => "audio.sampling_rate",
+    "mediainfo.track.Audio.ServiceKind"                       => "audio.service_kind",
+    "mediainfo.track.Audio.StreamSize"                        => "audio.stream_size",
+    "mediainfo.track.Audio.Title"                             => "audio.title",
+    "mediainfo.track.General.AudioCount"                      => "general.audio_count",
+    "mediainfo.track.General.CodecID"                         => "general.codec_ID",
+    "mediainfo.track.General.CompleteName"                    => "general.complete_name",
+    # "mediainfo.track.General.Description"                     => "general.description",  # not in FL
+    "mediainfo.track.General.Duration"                        => "general.duration",
+    "mediainfo.track.General.Encoded_Application_CompanyName" => "general.encoded_application_company_name",
+    "mediainfo.track.General.Encoded_Application"             => "general.writing_application",
+    "mediainfo.track.General.Encoded_Application_Name"        => "general.encoded_application_name",
+    "mediainfo.track.General.Encoded_Application_Version"     => "general.encoded_application_version",
+    "mediainfo.track.General.Encoded_Date"                    => "general.encoded_date",
+    "mediainfo.track.General.Encoded_Library"                 => "general.writing_library",
+    "mediainfo.track.General.Encoded_Library_Name"            => "general.encoded_library_name",
+    "mediainfo.track.General.Encoded_Library_Version"         => "general.encoded_library_version",
+    # "mediainfo.track.General.extra.bext_Present"              => "general.extra.bext_present",  # not in FL
+    "mediainfo.track.General.extra.ErrorDetectionType"        => "general.extra.error_detection_type",
+    "mediainfo.track.General.extra.IsTruncated"               => "general.extra.is_truncated",
+    "mediainfo.track.General.FileSize"                        => "general.file_size",
+    "mediainfo.track.General.Format"                          => "general.format",
+    "mediainfo.track.General.Format_Profile"                  => "general.format_profile",
+    "mediainfo.track.General.Format_Settings"                 => "general.format_settings",
+    "mediainfo.track.General.Format_Version"                  => "general.format_version",
+    "mediainfo.track.General.IsStreamable"                    => "general.is_streamable",
+    "mediainfo.track.General.MenuCount"                       => "general.menu_count",
+    "mediainfo.track.General.OtherCount"                      => "general.other_count",
+    "mediainfo.track.General.OverallBitRate"                  => "general.overall_bit_rate",
+    "mediainfo.track.General.OverallBitRateMode"              => "general.overall_bit_rate_mode",
+    "mediainfo.track.General.PackageName"                     => "general.package_name",
+    # "mediainfo.track.General.Producer"                        => "general.producer",  # not in FL
+    "mediainfo.track.General.StreamSize"                      => "general.stream_size",
+    "mediainfo.track.General.TextCount"                       => "general.text_count",
+    "mediainfo.track.General.Title"                           => "general.title",
+    "mediainfo.track.General.UniqueID"                        => "general.unique_id",
+    "mediainfo.track.General.VideoCount"                      => "general.video_count",
+    "mediainfo.track.Image.BitDepth"                          => "image.bit_depth",
+    "mediainfo.track.Image.ColorSpace"                        => "image.color_space",
+    "mediainfo.track.Image.colour_primaries"                  => "image.color_primaries",
+    "mediainfo.track.Image.Compression_Mode"                  => "image.compression_mode",
+    "mediainfo.track.Image.DisplayAspectRatio"                => "image.display_aspect_ratio",
+    "mediainfo.track.Image.Encoded_Date"                      => "image.encoded_date",
+    "mediainfo.track.Image.Encoded_Library"                   => "image.writing_library",
+    "mediainfo.track.Image.Format"                            => "image.format",
+    "mediainfo.track.Image.Format_Version"                    => "image.format_version",
+    "mediainfo.track.Image.FrameRate"                         => "image.frame_rate",
+    "mediainfo.track.Image.Height"                            => "image.height",
+    "mediainfo.track.Image.StreamSize"                        => "image.stream_size",
+    "mediainfo.track.Image.transfer_characteristics"          => "image.transfer_characteristics",
+    "mediainfo.track.Image.Width"                             => "image.width",
+    "mediainfo.track.Video.BitDepth"                          => "video.bit_depth",
+    "mediainfo.track.Video.BitRate_Mode"                      => "video.bit_rate_mode",
+    "mediainfo.track.Video.BitRate"                           => "video.bit_rate",
+    # "mediainfo.track.video.Bits__Pixel_Frame_"                => "video.bits__Pixel_Frame_",  # not in mediainfo extractor yet
+    "mediainfo.track.Video.ChromaSubsampling"                 => "video.chroma_subsampling",
+    "mediainfo.track.Video.CodecID"                           => "video.codec_ID",
+    "mediainfo.track.Video.ColorSpace"                        => "video.color_space",
+    "mediainfo.track.Video.Compression_Mode"                  => "video.compression_mode",
+    "mediainfo.track.Video.Default"                           => "video.default",
+    "mediainfo.track.Video.DisplayAspectRatio"                => "video.display_aspect_ratio",
+    "mediainfo.track.Video.Duration"                          => "video.duration",
+    "mediainfo.track.Video.Encoded_Library"                   => "video.encoded_library",
+    "mediainfo.track.Video.extra.coder_type"                  => "video.extra.coder_type",
+    "mediainfo.track.Video.extra.ErrorDetectionType"          => "video.extra.error_detection_type",
+    "mediainfo.track.Video.extra.MaxSlicesCount"              => "video.extra.max_slices_count",
+    "mediainfo.track.Video.extra.OriginalSourceMedium"        => "video.extra.original_source_medium",
+    "mediainfo.track.Video.Forced"                            => "video.forced",
+    "mediainfo.track.Video.Format_Profile"                    => "video.format_profile",
+    "mediainfo.track.Video.Format_Settings_GOP"               => "video.format_settings_GOP",
+    "mediainfo.track.Video.Format_Settings_Wrapping"          => "video.format_Settings_Wrapping",
+    "mediainfo.track.Video.Format_Version"                    => "video.format_version",
+    "mediainfo.track.Video.Format"                            => "video.format",
+    "mediainfo.track.Video.FrameCount"                        => "video.frame_count",
+    "mediainfo.track.Video.FrameRate"                         => "video.frame_rate",
+    "mediainfo.track.Video.Height"                            => "video.height",
+    "mediainfo.track.Video.ID"                                => "video.ID",
+    "mediainfo.track.Video.PixelAspectRatioOriginal"          => "video.pixel_aspect_ratio_original",
+    "mediainfo.track.Video.PixelAspectRatio"                  => "video.pixel_aspect_ratio",
+    "mediainfo.track.Video.ScanOrder"                         => "video.scan_order",
+    "mediainfo.track.Video.ScanType"                          => "video.scan_type",
+    "mediainfo.track.Video.Standard"                          => "video.standard",
+    "mediainfo.track.Video.StreamSize"                        => "video.stream_size",
+    "mediainfo.track.Video.TimeCode_FirstFrame"               => "video.time_code_of_first_frame",
+    "mediainfo.track.Video.TimeCode_Source"                   => "video.time_code_source",
+    "mediainfo.track.Video.Title"                             => "video.title",
+    "mediainfo.track.Video.transfer_characteristics"          => "video.transfer_characteristics",
+    "mediainfo.track.Video.Width"                             => "video.width"
 );
 my $plugin_name = "SLUBTechnicalMetadataExtractorMediaConchPlugin";
 my $classification_group = "Video";