diff --git a/Application/Model/Constants.php b/Application/Model/Constants.php
new file mode 100644
index 0000000..62ff474
--- /dev/null
+++ b/Application/Model/Constants.php
@@ -0,0 +1,14 @@
+<?php
+	
+declare(strict_types=1);
+
+namespace D3\ManufacturerInformation\Application\Model;
+
+
+class Constants
+{
+	public const OXID_MODULE_ID = 'd3manufacturerinformation';
+	
+	// Tables and Database
+	public const D3_OXMANUFACTURERS_LONGDESC_FIELDNAME = 'D3DESCRIPTION';
+}
\ No newline at end of file
diff --git a/metadata.php b/metadata.php
index 3aa2732..f81f93b 100644
--- a/metadata.php
+++ b/metadata.php
@@ -14,10 +14,13 @@
 declare(strict_types=1);
 	
 	use D3\ManufacturerInformation\Application\Controller\Admin\ManufacturerInfoLongdesc;
+	use D3\ManufacturerInformation\Application\Model\Constants;
+	use D3\ManufacturerInformation\Modules\Application\Model\D3ManufacturerLongDesc;
+	use OxidEsales\Eshop\Application\Model\Manufacturer as OEManufacturer;
 	
 	$sMetadataVersion = '2.1';
 
-$sModuleId = 'd3manufacturerinformation';
+$sModuleId = Constants::OXID_MODULE_ID;
 $logo = '<img src="https://logos.oxidmodule.com/d3logo.svg" alt="(D3)" style="height:1em;width:1em">';
 
 /**
@@ -39,7 +42,7 @@ $aModule = [
 		"d3manufacturerinfolongdesc" => ManufacturerInfoLongdesc::class
     ],
     'extend'      => [
-//      \OxidEsales\Eshop\Core\ShopControl::class => \D3\ThisModule\Modules\Core\ShopControl_MyModule::class
+		OEManufacturer::class => D3ManufacturerLongDesc::class
     ],
     'events'      => [
 //      'onActivate'    => '\D3\ThisModule\Setup\Events::onActivate',