diff --git a/.classpath b/.classpath
index 4857be4..ead1bad 100644
--- a/.classpath
+++ b/.classpath
@@ -6,7 +6,8 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/adempiere"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/.github/workflows/build_with_gradle.yml b/.github/workflows/build_with_gradle.yml
index c16cc45..cc07cb3 100644
--- a/.github/workflows/build_with_gradle.yml
+++ b/.github/workflows/build_with_gradle.yml
@@ -26,21 +26,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt-hotspot'
-          java-version: 8
-
-      - name: get adempiere source
-        run: |
-          download_repo="https://github.com/erpcya/adempiere/releases/download/3.9.3-rs-4.3/Adempiere_393LTS.tar.gz"
-          wget $download_repo -c -O Adempiere.tar.gz
-      
-      - name: uncompress file
-        run: tar -xzf Adempiere.tar.gz
-      - name: create dependences folder
-        run: mkdir dependences
-      - name: move dependences
-        run: mv Adempiere/lib/*.jar dependences/
-      - name: move packages
-        run: mv Adempiere/packages/*/lib/*.jar dependences/
+          java-version: 11
 
       - name: Build with Gradle
         run: gradle build
diff --git a/.github/workflows/publish_with_gradle.yml b/.github/workflows/publish_with_gradle.yml
index 3eb704e..60729a6 100644
--- a/.github/workflows/publish_with_gradle.yml
+++ b/.github/workflows/publish_with_gradle.yml
@@ -25,26 +25,13 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt-hotspot'
-          java-version: 8
-
-      - name: get adempiere source
-        run: |
-          download_repo="https://github.com/erpcya/adempiere/releases/download/3.9.3-rs-4.3/Adempiere_393LTS.tar.gz"
-          wget $download_repo -c -O Adempiere.tar.gz
-      
-      - name: uncompress file
-        run: tar -xzf Adempiere.tar.gz
-      - name: create dependences folder
-        run: mkdir dependences
-      - name: move dependences
-        run: mv Adempiere/lib/*.jar dependences/
-      - name: move packages
-        run: mv Adempiere/packages/*/lib/*.jar dependences/
+          java-version: 11
 
       - name: Publish with Gradle
         run: gradle publish
         env:
           ADEMPIERE_LIBRARY_VERSION: ${{ github.event.release.tag_name }}
+          ADEMPIERE_LIBRARY_GROUP: ${{ secrets.ADEMPIERE_LIBRARY_GROUP }}
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SECRET }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_PASSPHRASE }}
           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_TOKEN }}
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index c59d0c6..1a070d3 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11
diff --git a/build.gradle b/build.gradle
index af65ef7..ada955f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,24 +2,30 @@ apply plugin: 'java-library'
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
 repositories {
     mavenLocal()
     mavenCentral()
 }
 
-if (JavaVersion.current().isJava8Compatible()) {
-    allprojects {
-        tasks.withType(Javadoc) {
-            options.addStringOption('Xdoclint:none', '-quiet')
-        }
-    }
+//Solution by the second link
+allprojects {
+    tasks.withType(Javadoc).all { enabled = false }
 }
 
+sourceCompatibility = 1.11
+def baseVersion = '3.9.4'
+def baseGroupId = 'io.github.adempiere'
+def customGroupId = System.getenv("ADEMPIERE_LIBRARY_GROUP")
+
 dependencies {
-    compileOnly fileTree(dir: 'dependences', include: ['*.jar'])
+    api fileTree(
+        dir: 'lib',
+        include: [
+            '*.jar'
+        ]
+    )
+    //	ADempiere Core
+	api "${baseGroupId}:base:${baseVersion}"
 }
 
 sourceSets {
@@ -58,7 +64,7 @@ publishing {
     }
     publications {
         mavenJava(MavenPublication) {
-        	groupId 'io.github.adempiere'
+        	groupId customGroupId
             artifactId 'withholding-engine'
             version
            	from components.java
diff --git a/src/main/java/org/spin/model/I_WH_Definition.java b/src/main/java/org/spin/model/I_WH_Definition.java
index fee4c87..ae4123a 100644
--- a/src/main/java/org/spin/model/I_WH_Definition.java
+++ b/src/main/java/org/spin/model/I_WH_Definition.java
@@ -76,7 +76,7 @@ public interface I_WH_Definition
 	  */
 	public int getC_BPartner_ID();
 
-	public org.compiere.model.I_C_BPartner getC_BPartner() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_BPartner getC_BPartner() throws RuntimeException;
 
     /** Column name C_Charge_ID */
     public static final String COLUMNNAME_C_Charge_ID = "C_Charge_ID";
@@ -91,7 +91,7 @@ public interface I_WH_Definition
 	  */
 	public int getC_Charge_ID();
 
-	public org.compiere.model.I_C_Charge getC_Charge() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_Charge getC_Charge() throws RuntimeException;
 
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
@@ -122,7 +122,7 @@ public interface I_WH_Definition
 	  */
 	public int getDeclarationCreditDocType_ID();
 
-	public org.compiere.model.I_C_DocType getDeclarationCreditDocType() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_DocType getDeclarationCreditDocType() throws RuntimeException;
 
     /** Column name DeclarationDebitDocType_ID */
     public static final String COLUMNNAME_DeclarationDebitDocType_ID = "DeclarationDebitDocType_ID";
@@ -137,7 +137,7 @@ public interface I_WH_Definition
 	  */
 	public int getDeclarationDebitDocType_ID();
 
-	public org.compiere.model.I_C_DocType getDeclarationDebitDocType() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_DocType getDeclarationDebitDocType() throws RuntimeException;
 
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
@@ -248,7 +248,7 @@ public interface I_WH_Definition
 	  */
 	public int getWithholdingCreditDocType_ID();
 
-	public org.compiere.model.I_C_DocType getWithholdingCreditDocType() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_DocType getWithholdingCreditDocType() throws RuntimeException;
 
     /** Column name WithholdingDebitDocType_ID */
     public static final String COLUMNNAME_WithholdingDebitDocType_ID = "WithholdingDebitDocType_ID";
@@ -263,5 +263,5 @@ public interface I_WH_Definition
 	  */
 	public int getWithholdingDebitDocType_ID();
 
-	public org.compiere.model.I_C_DocType getWithholdingDebitDocType() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_DocType getWithholdingDebitDocType() throws RuntimeException;
 }
diff --git a/src/main/java/org/spin/model/I_WH_DefinitionLine.java b/src/main/java/org/spin/model/I_WH_DefinitionLine.java
index 60079f7..99252b6 100644
--- a/src/main/java/org/spin/model/I_WH_DefinitionLine.java
+++ b/src/main/java/org/spin/model/I_WH_DefinitionLine.java
@@ -76,7 +76,7 @@ public interface I_WH_DefinitionLine
 	  */
 	public int getC_DocType_ID();
 
-	public org.compiere.model.I_C_DocType getC_DocType() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_DocType getC_DocType() throws RuntimeException;
 
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
diff --git a/src/main/java/org/spin/model/I_WH_Log.java b/src/main/java/org/spin/model/I_WH_Log.java
index f7d73a6..7282baa 100644
--- a/src/main/java/org/spin/model/I_WH_Log.java
+++ b/src/main/java/org/spin/model/I_WH_Log.java
@@ -76,7 +76,7 @@ public interface I_WH_Log
 	  */
 	public int getC_Invoice_ID();
 
-	public org.compiere.model.I_C_Invoice getC_Invoice() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_Invoice getC_Invoice() throws RuntimeException;
 
     /** Column name C_InvoiceLine_ID */
     public static final String COLUMNNAME_C_InvoiceLine_ID = "C_InvoiceLine_ID";
@@ -91,7 +91,7 @@ public interface I_WH_Log
 	  */
 	public int getC_InvoiceLine_ID();
 
-	public org.compiere.model.I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException;
 
     /** Column name Comments */
     public static final String COLUMNNAME_Comments = "Comments";
@@ -144,7 +144,7 @@ public interface I_WH_Log
 	/** Get Source Invoice	  */
 	public int getSourceInvoice_ID();
 
-	public org.compiere.model.I_C_Invoice getSourceInvoice() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_Invoice getSourceInvoice() throws RuntimeException;
 
     /** Column name SourceInvoiceLine_ID */
     public static final String COLUMNNAME_SourceInvoiceLine_ID = "SourceInvoiceLine_ID";
@@ -155,7 +155,7 @@ public interface I_WH_Log
 	/** Get Source Invoice Line	  */
 	public int getSourceInvoiceLine_ID();
 
-	public org.compiere.model.I_C_InvoiceLine getSourceInvoiceLine() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_InvoiceLine getSourceInvoiceLine() throws RuntimeException;
 
     /** Column name Updated */
     public static final String COLUMNNAME_Updated = "Updated";
diff --git a/src/main/java/org/spin/model/I_WH_Setting.java b/src/main/java/org/spin/model/I_WH_Setting.java
index 2cc542c..de413a5 100644
--- a/src/main/java/org/spin/model/I_WH_Setting.java
+++ b/src/main/java/org/spin/model/I_WH_Setting.java
@@ -76,7 +76,7 @@ public interface I_WH_Setting
 	  */
 	public int getAD_Table_ID();
 
-	public org.compiere.model.I_AD_Table getAD_Table() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_AD_Table getAD_Table() throws RuntimeException;
 
     /** Column name C_Charge_ID */
     public static final String COLUMNNAME_C_Charge_ID = "C_Charge_ID";
@@ -91,7 +91,7 @@ public interface I_WH_Setting
 	  */
 	public int getC_Charge_ID();
 
-	public org.compiere.model.I_C_Charge getC_Charge() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_Charge getC_Charge() throws RuntimeException;
 
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
@@ -281,7 +281,7 @@ public interface I_WH_Setting
 	  */
 	public int getWithholdingCreditDocType_ID();
 
-	public org.compiere.model.I_C_DocType getWithholdingCreditDocType() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_DocType getWithholdingCreditDocType() throws RuntimeException;
 
     /** Column name WithholdingDebitDocType_ID */
     public static final String COLUMNNAME_WithholdingDebitDocType_ID = "WithholdingDebitDocType_ID";
@@ -296,5 +296,5 @@ public interface I_WH_Setting
 	  */
 	public int getWithholdingDebitDocType_ID();
 
-	public org.compiere.model.I_C_DocType getWithholdingDebitDocType() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_DocType getWithholdingDebitDocType() throws RuntimeException;
 }
diff --git a/src/main/java/org/spin/model/I_WH_Type.java b/src/main/java/org/spin/model/I_WH_Type.java
index e755597..50cc020 100644
--- a/src/main/java/org/spin/model/I_WH_Type.java
+++ b/src/main/java/org/spin/model/I_WH_Type.java
@@ -76,7 +76,7 @@ public interface I_WH_Type
 	  */
 	public int getAD_View_ID();
 
-	public org.adempiere.model.I_AD_View getAD_View() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_AD_View getAD_View() throws RuntimeException;
 
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
@@ -107,7 +107,7 @@ public interface I_WH_Type
 	  */
 	public int getDeclarationCreditDocType_ID();
 
-	public org.compiere.model.I_C_DocType getDeclarationCreditDocType() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_DocType getDeclarationCreditDocType() throws RuntimeException;
 
     /** Column name DeclarationDebitDocType_ID */
     public static final String COLUMNNAME_DeclarationDebitDocType_ID = "DeclarationDebitDocType_ID";
@@ -122,7 +122,7 @@ public interface I_WH_Type
 	  */
 	public int getDeclarationDebitDocType_ID();
 
-	public org.compiere.model.I_C_DocType getDeclarationDebitDocType() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_DocType getDeclarationDebitDocType() throws RuntimeException;
 
     /** Column name Description */
     public static final String COLUMNNAME_Description = "Description";
@@ -231,7 +231,7 @@ public interface I_WH_Type
 	  */
 	public int getWithholdingCreditDocType_ID();
 
-	public org.compiere.model.I_C_DocType getWithholdingCreditDocType() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_DocType getWithholdingCreditDocType() throws RuntimeException;
 
     /** Column name WithholdingDebitDocType_ID */
     public static final String COLUMNNAME_WithholdingDebitDocType_ID = "WithholdingDebitDocType_ID";
@@ -246,5 +246,5 @@ public interface I_WH_Type
 	  */
 	public int getWithholdingDebitDocType_ID();
 
-	public org.compiere.model.I_C_DocType getWithholdingDebitDocType() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_DocType getWithholdingDebitDocType() throws RuntimeException;
 }
diff --git a/src/main/java/org/spin/model/I_WH_Withholding.java b/src/main/java/org/spin/model/I_WH_Withholding.java
index 46c7bac..ecc6a0d 100644
--- a/src/main/java/org/spin/model/I_WH_Withholding.java
+++ b/src/main/java/org/spin/model/I_WH_Withholding.java
@@ -85,7 +85,7 @@ public interface I_WH_Withholding
 	  */
 	public int getC_BPartner_ID();
 
-	public org.compiere.model.I_C_BPartner getC_BPartner() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_BPartner getC_BPartner() throws RuntimeException;
 
     /** Column name C_BPartner_Location_ID */
     public static final String COLUMNNAME_C_BPartner_Location_ID = "C_BPartner_Location_ID";
@@ -100,7 +100,7 @@ public interface I_WH_Withholding
 	  */
 	public int getC_BPartner_Location_ID();
 
-	public org.compiere.model.I_C_BPartner_Location getC_BPartner_Location() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_BPartner_Location getC_BPartner_Location() throws RuntimeException;
 
     /** Column name C_ConversionType_ID */
     public static final String COLUMNNAME_C_ConversionType_ID = "C_ConversionType_ID";
@@ -115,7 +115,7 @@ public interface I_WH_Withholding
 	  */
 	public int getC_ConversionType_ID();
 
-	public org.compiere.model.I_C_ConversionType getC_ConversionType() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_ConversionType getC_ConversionType() throws RuntimeException;
 
     /** Column name C_Currency_ID */
     public static final String COLUMNNAME_C_Currency_ID = "C_Currency_ID";
@@ -130,7 +130,7 @@ public interface I_WH_Withholding
 	  */
 	public int getC_Currency_ID();
 
-	public org.compiere.model.I_C_Currency getC_Currency() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_Currency getC_Currency() throws RuntimeException;
 
     /** Column name C_DocType_ID */
     public static final String COLUMNNAME_C_DocType_ID = "C_DocType_ID";
@@ -145,7 +145,7 @@ public interface I_WH_Withholding
 	  */
 	public int getC_DocType_ID();
 
-	public org.compiere.model.I_C_DocType getC_DocType() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_DocType getC_DocType() throws RuntimeException;
 
     /** Column name C_InvoiceLine_ID */
     public static final String COLUMNNAME_C_InvoiceLine_ID = "C_InvoiceLine_ID";
@@ -160,7 +160,7 @@ public interface I_WH_Withholding
 	  */
 	public int getC_InvoiceLine_ID();
 
-	public org.compiere.model.I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException;
 
     /** Column name C_Invoice_ID */
     public static final String COLUMNNAME_C_Invoice_ID = "C_Invoice_ID";
@@ -175,7 +175,7 @@ public interface I_WH_Withholding
 	  */
 	public int getC_Invoice_ID();
 
-	public org.compiere.model.I_C_Invoice getC_Invoice() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_Invoice getC_Invoice() throws RuntimeException;
 
     /** Column name C_Tax_ID */
     public static final String COLUMNNAME_C_Tax_ID = "C_Tax_ID";
@@ -190,7 +190,7 @@ public interface I_WH_Withholding
 	  */
 	public int getC_Tax_ID();
 
-	public org.compiere.model.I_C_Tax getC_Tax() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_Tax getC_Tax() throws RuntimeException;
 
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
@@ -395,7 +395,7 @@ public interface I_WH_Withholding
 	/** Get Source Invoice Line	  */
 	public int getSourceInvoiceLine_ID();
 
-	public org.compiere.model.I_C_InvoiceLine getSourceInvoiceLine() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_InvoiceLine getSourceInvoiceLine() throws RuntimeException;
 
     /** Column name SourceInvoice_ID */
     public static final String COLUMNNAME_SourceInvoice_ID = "SourceInvoice_ID";
@@ -406,7 +406,7 @@ public interface I_WH_Withholding
 	/** Get Source Invoice	  */
 	public int getSourceInvoice_ID();
 
-	public org.compiere.model.I_C_Invoice getSourceInvoice() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_Invoice getSourceInvoice() throws RuntimeException;
 
     /** Column name SourceOrderLine_ID */
     public static final String COLUMNNAME_SourceOrderLine_ID = "SourceOrderLine_ID";
@@ -417,7 +417,7 @@ public interface I_WH_Withholding
 	/** Get Source Order Line	  */
 	public int getSourceOrderLine_ID();
 
-	public org.compiere.model.I_C_OrderLine getSourceOrderLine() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_OrderLine getSourceOrderLine() throws RuntimeException;
 
     /** Column name SourceOrder_ID */
     public static final String COLUMNNAME_SourceOrder_ID = "SourceOrder_ID";
@@ -428,7 +428,7 @@ public interface I_WH_Withholding
 	/** Get Source Order	  */
 	public int getSourceOrder_ID();
 
-	public org.compiere.model.I_C_Order getSourceOrder() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_Order getSourceOrder() throws RuntimeException;
 
     /** Column name UUID */
     public static final String COLUMNNAME_UUID = "UUID";
@@ -520,7 +520,7 @@ public interface I_WH_Withholding
 	  */
 	public int getWithholdingDeclaration_ID();
 
-	public org.compiere.model.I_C_Invoice getWithholdingDeclaration() throws RuntimeException;
+	public org.adempiere.core.domains.models.I_C_Invoice getWithholdingDeclaration() throws RuntimeException;
 
     /** Column name WithholdingRate */
     public static final String COLUMNNAME_WithholdingRate = "WithholdingRate";
diff --git a/src/main/java/org/spin/model/Withholding.java b/src/main/java/org/spin/model/Withholding.java
index 3fb6345..137f10b 100644
--- a/src/main/java/org/spin/model/Withholding.java
+++ b/src/main/java/org/spin/model/Withholding.java
@@ -19,7 +19,7 @@
 import java.util.stream.Collectors;
 
 import org.adempiere.exceptions.AdempiereException;
-import org.compiere.model.I_C_Order;
+import org.adempiere.core.domains.models.I_C_Order;
 import org.compiere.model.MClient;
 import org.compiere.model.MInvoice;
 import org.compiere.model.MTable;
diff --git a/src/main/java/org/spin/model/X_WH_Definition.java b/src/main/java/org/spin/model/X_WH_Definition.java
index c4993cd..691d5b6 100644
--- a/src/main/java/org/spin/model/X_WH_Definition.java
+++ b/src/main/java/org/spin/model/X_WH_Definition.java
@@ -72,9 +72,9 @@ public String toString()
       return sb.toString();
     }
 
-	public org.compiere.model.I_C_BPartner getC_BPartner() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_BPartner getC_BPartner() throws RuntimeException
     {
-		return (org.compiere.model.I_C_BPartner)MTable.get(getCtx(), org.compiere.model.I_C_BPartner.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_BPartner)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_BPartner.Table_Name)
 			.getPO(getC_BPartner_ID(), get_TrxName());	}
 
 	/** Set Business Partner .
@@ -100,9 +100,9 @@ public int getC_BPartner_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_Charge getC_Charge() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_Charge getC_Charge() throws RuntimeException
     {
-		return (org.compiere.model.I_C_Charge)MTable.get(getCtx(), org.compiere.model.I_C_Charge.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_Charge)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_Charge.Table_Name)
 			.getPO(getC_Charge_ID(), get_TrxName());	}
 
 	/** Set Charge.
@@ -128,9 +128,9 @@ public int getC_Charge_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_DocType getDeclarationCreditDocType() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_DocType getDeclarationCreditDocType() throws RuntimeException
     {
-		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_DocType)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_DocType.Table_Name)
 			.getPO(getDeclarationCreditDocType_ID(), get_TrxName());	}
 
 	/** Set Declaration Credit Document Type.
@@ -156,9 +156,9 @@ public int getDeclarationCreditDocType_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_DocType getDeclarationDebitDocType() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_DocType getDeclarationDebitDocType() throws RuntimeException
     {
-		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_DocType)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_DocType.Table_Name)
 			.getPO(getDeclarationDebitDocType_ID(), get_TrxName());	}
 
 	/** Set Declaration Debit Document Type.
@@ -286,9 +286,9 @@ public int getWH_Type_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_DocType getWithholdingCreditDocType() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_DocType getWithholdingCreditDocType() throws RuntimeException
     {
-		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_DocType)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_DocType.Table_Name)
 			.getPO(getWithholdingCreditDocType_ID(), get_TrxName());	}
 
 	/** Set Withholding Credit Document Type.
@@ -314,9 +314,9 @@ public int getWithholdingCreditDocType_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_DocType getWithholdingDebitDocType() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_DocType getWithholdingDebitDocType() throws RuntimeException
     {
-		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_DocType)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_DocType.Table_Name)
 			.getPO(getWithholdingDebitDocType_ID(), get_TrxName());	}
 
 	/** Set Withholding Debit Document Type.
diff --git a/src/main/java/org/spin/model/X_WH_DefinitionLine.java b/src/main/java/org/spin/model/X_WH_DefinitionLine.java
index ff59c5c..722a0cc 100644
--- a/src/main/java/org/spin/model/X_WH_DefinitionLine.java
+++ b/src/main/java/org/spin/model/X_WH_DefinitionLine.java
@@ -72,9 +72,9 @@ public String toString()
       return sb.toString();
     }
 
-	public org.compiere.model.I_C_DocType getC_DocType() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_DocType getC_DocType() throws RuntimeException
     {
-		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_DocType)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_DocType.Table_Name)
 			.getPO(getC_DocType_ID(), get_TrxName());	}
 
 	/** Set Document Type.
diff --git a/src/main/java/org/spin/model/X_WH_Log.java b/src/main/java/org/spin/model/X_WH_Log.java
index 2a02ec2..44e33ff 100644
--- a/src/main/java/org/spin/model/X_WH_Log.java
+++ b/src/main/java/org/spin/model/X_WH_Log.java
@@ -73,9 +73,9 @@ public String toString()
       return sb.toString();
     }
 
-	public org.compiere.model.I_C_Invoice getC_Invoice() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_Invoice getC_Invoice() throws RuntimeException
     {
-		return (org.compiere.model.I_C_Invoice)MTable.get(getCtx(), org.compiere.model.I_C_Invoice.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_Invoice)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_Invoice.Table_Name)
 			.getPO(getC_Invoice_ID(), get_TrxName());	}
 
 	/** Set Invoice.
@@ -101,9 +101,9 @@ public int getC_Invoice_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException
     {
-		return (org.compiere.model.I_C_InvoiceLine)MTable.get(getCtx(), org.compiere.model.I_C_InvoiceLine.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_InvoiceLine)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_InvoiceLine.Table_Name)
 			.getPO(getC_InvoiceLine_ID(), get_TrxName());	}
 
 	/** Set Invoice Line.
@@ -146,9 +146,9 @@ public String getComments ()
 		return (String)get_Value(COLUMNNAME_Comments);
 	}
 
-	public org.compiere.model.I_C_Invoice getSourceInvoice() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_Invoice getSourceInvoice() throws RuntimeException
     {
-		return (org.compiere.model.I_C_Invoice)MTable.get(getCtx(), org.compiere.model.I_C_Invoice.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_Invoice)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_Invoice.Table_Name)
 			.getPO(getSourceInvoice_ID(), get_TrxName());	}
 
 	/** Set Source Invoice.
@@ -171,9 +171,9 @@ public int getSourceInvoice_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_InvoiceLine getSourceInvoiceLine() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_InvoiceLine getSourceInvoiceLine() throws RuntimeException
     {
-		return (org.compiere.model.I_C_InvoiceLine)MTable.get(getCtx(), org.compiere.model.I_C_InvoiceLine.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_InvoiceLine)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_InvoiceLine.Table_Name)
 			.getPO(getSourceInvoiceLine_ID(), get_TrxName());	}
 
 	/** Set Source Invoice Line.
diff --git a/src/main/java/org/spin/model/X_WH_Setting.java b/src/main/java/org/spin/model/X_WH_Setting.java
index 4fc5602..c31004c 100644
--- a/src/main/java/org/spin/model/X_WH_Setting.java
+++ b/src/main/java/org/spin/model/X_WH_Setting.java
@@ -78,9 +78,9 @@ public String toString()
       return sb.toString();
     }
 
-	public org.compiere.model.I_AD_Table getAD_Table() throws RuntimeException
+	public org.adempiere.core.domains.models.I_AD_Table getAD_Table() throws RuntimeException
     {
-		return (org.compiere.model.I_AD_Table)MTable.get(getCtx(), org.compiere.model.I_AD_Table.Table_Name)
+		return (org.adempiere.core.domains.models.I_AD_Table)MTable.get(getCtx(), org.adempiere.core.domains.models.I_AD_Table.Table_Name)
 			.getPO(getAD_Table_ID(), get_TrxName());	}
 
 	/** Set Table.
@@ -106,9 +106,9 @@ public int getAD_Table_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_Charge getC_Charge() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_Charge getC_Charge() throws RuntimeException
     {
-		return (org.compiere.model.I_C_Charge)MTable.get(getCtx(), org.compiere.model.I_C_Charge.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_Charge)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_Charge.Table_Name)
 			.getPO(getC_Charge_ID(), get_TrxName());	}
 
 	/** Set Charge.
@@ -389,9 +389,9 @@ public String getWithholdingClassName ()
 		return (String)get_Value(COLUMNNAME_WithholdingClassName);
 	}
 
-	public org.compiere.model.I_C_DocType getWithholdingCreditDocType() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_DocType getWithholdingCreditDocType() throws RuntimeException
     {
-		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_DocType)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_DocType.Table_Name)
 			.getPO(getWithholdingCreditDocType_ID(), get_TrxName());	}
 
 	/** Set Withholding Credit Document Type.
@@ -417,9 +417,9 @@ public int getWithholdingCreditDocType_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_DocType getWithholdingDebitDocType() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_DocType getWithholdingDebitDocType() throws RuntimeException
     {
-		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_DocType)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_DocType.Table_Name)
 			.getPO(getWithholdingDebitDocType_ID(), get_TrxName());	}
 
 	/** Set Withholding Debit Document Type.
diff --git a/src/main/java/org/spin/model/X_WH_Type.java b/src/main/java/org/spin/model/X_WH_Type.java
index 7f6e436..858fc92 100644
--- a/src/main/java/org/spin/model/X_WH_Type.java
+++ b/src/main/java/org/spin/model/X_WH_Type.java
@@ -73,9 +73,9 @@ public String toString()
       return sb.toString();
     }
 
-	public org.adempiere.model.I_AD_View getAD_View() throws RuntimeException
+	public org.adempiere.core.domains.models.I_AD_View getAD_View() throws RuntimeException
     {
-		return (org.adempiere.model.I_AD_View)MTable.get(getCtx(), org.adempiere.model.I_AD_View.Table_Name)
+		return (org.adempiere.core.domains.models.I_AD_View)MTable.get(getCtx(), org.adempiere.core.domains.models.I_AD_View.Table_Name)
 			.getPO(getAD_View_ID(), get_TrxName());	}
 
 	/** Set View.
@@ -101,9 +101,9 @@ public int getAD_View_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_DocType getDeclarationCreditDocType() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_DocType getDeclarationCreditDocType() throws RuntimeException
     {
-		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_DocType)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_DocType.Table_Name)
 			.getPO(getDeclarationCreditDocType_ID(), get_TrxName());	}
 
 	/** Set Declaration Credit Document Type.
@@ -129,9 +129,9 @@ public int getDeclarationCreditDocType_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_DocType getDeclarationDebitDocType() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_DocType getDeclarationDebitDocType() throws RuntimeException
     {
-		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_DocType)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_DocType.Table_Name)
 			.getPO(getDeclarationDebitDocType_ID(), get_TrxName());	}
 
 	/** Set Declaration Debit Document Type.
@@ -256,9 +256,9 @@ public int getWH_Type_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_DocType getWithholdingCreditDocType() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_DocType getWithholdingCreditDocType() throws RuntimeException
     {
-		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_DocType)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_DocType.Table_Name)
 			.getPO(getWithholdingCreditDocType_ID(), get_TrxName());	}
 
 	/** Set Withholding Credit Document Type.
@@ -284,9 +284,9 @@ public int getWithholdingCreditDocType_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_DocType getWithholdingDebitDocType() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_DocType getWithholdingDebitDocType() throws RuntimeException
     {
-		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_DocType)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_DocType.Table_Name)
 			.getPO(getWithholdingDebitDocType_ID(), get_TrxName());	}
 
 	/** Set Withholding Debit Document Type.
diff --git a/src/main/java/org/spin/model/X_WH_Withholding.java b/src/main/java/org/spin/model/X_WH_Withholding.java
index 1ee1a40..72f1a31 100644
--- a/src/main/java/org/spin/model/X_WH_Withholding.java
+++ b/src/main/java/org/spin/model/X_WH_Withholding.java
@@ -109,9 +109,9 @@ public BigDecimal getA_Base_Amount ()
 		return bd;
 	}
 
-	public org.compiere.model.I_C_BPartner getC_BPartner() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_BPartner getC_BPartner() throws RuntimeException
     {
-		return (org.compiere.model.I_C_BPartner)MTable.get(getCtx(), org.compiere.model.I_C_BPartner.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_BPartner)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_BPartner.Table_Name)
 			.getPO(getC_BPartner_ID(), get_TrxName());	}
 
 	/** Set Business Partner .
@@ -137,9 +137,9 @@ public int getC_BPartner_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_BPartner_Location getC_BPartner_Location() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_BPartner_Location getC_BPartner_Location() throws RuntimeException
     {
-		return (org.compiere.model.I_C_BPartner_Location)MTable.get(getCtx(), org.compiere.model.I_C_BPartner_Location.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_BPartner_Location)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_BPartner_Location.Table_Name)
 			.getPO(getC_BPartner_Location_ID(), get_TrxName());	}
 
 	/** Set Partner Location.
@@ -165,9 +165,9 @@ public int getC_BPartner_Location_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_ConversionType getC_ConversionType() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_ConversionType getC_ConversionType() throws RuntimeException
     {
-		return (org.compiere.model.I_C_ConversionType)MTable.get(getCtx(), org.compiere.model.I_C_ConversionType.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_ConversionType)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_ConversionType.Table_Name)
 			.getPO(getC_ConversionType_ID(), get_TrxName());	}
 
 	/** Set Currency Type.
@@ -193,9 +193,9 @@ public int getC_ConversionType_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_Currency getC_Currency() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_Currency getC_Currency() throws RuntimeException
     {
-		return (org.compiere.model.I_C_Currency)MTable.get(getCtx(), org.compiere.model.I_C_Currency.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_Currency)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_Currency.Table_Name)
 			.getPO(getC_Currency_ID(), get_TrxName());	}
 
 	/** Set Currency.
@@ -221,9 +221,9 @@ public int getC_Currency_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_DocType getC_DocType() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_DocType getC_DocType() throws RuntimeException
     {
-		return (org.compiere.model.I_C_DocType)MTable.get(getCtx(), org.compiere.model.I_C_DocType.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_DocType)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_DocType.Table_Name)
 			.getPO(getC_DocType_ID(), get_TrxName());	}
 
 	/** Set Document Type.
@@ -249,9 +249,9 @@ public int getC_DocType_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException
     {
-		return (org.compiere.model.I_C_InvoiceLine)MTable.get(getCtx(), org.compiere.model.I_C_InvoiceLine.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_InvoiceLine)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_InvoiceLine.Table_Name)
 			.getPO(getC_InvoiceLine_ID(), get_TrxName());	}
 
 	/** Set Invoice Line.
@@ -277,9 +277,9 @@ public int getC_InvoiceLine_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_Invoice getC_Invoice() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_Invoice getC_Invoice() throws RuntimeException
     {
-		return (org.compiere.model.I_C_Invoice)MTable.get(getCtx(), org.compiere.model.I_C_Invoice.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_Invoice)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_Invoice.Table_Name)
 			.getPO(getC_Invoice_ID(), get_TrxName());	}
 
 	/** Set Invoice.
@@ -305,9 +305,9 @@ public int getC_Invoice_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_Tax getC_Tax() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_Tax getC_Tax() throws RuntimeException
     {
-		return (org.compiere.model.I_C_Tax)MTable.get(getCtx(), org.compiere.model.I_C_Tax.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_Tax)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_Tax.Table_Name)
 			.getPO(getC_Tax_ID(), get_TrxName());	}
 
 	/** Set Tax.
@@ -666,9 +666,9 @@ public boolean isProcessing ()
 		return false;
 	}
 
-	public org.compiere.model.I_C_InvoiceLine getSourceInvoiceLine() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_InvoiceLine getSourceInvoiceLine() throws RuntimeException
     {
-		return (org.compiere.model.I_C_InvoiceLine)MTable.get(getCtx(), org.compiere.model.I_C_InvoiceLine.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_InvoiceLine)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_InvoiceLine.Table_Name)
 			.getPO(getSourceInvoiceLine_ID(), get_TrxName());	}
 
 	/** Set Source Invoice Line.
@@ -691,9 +691,9 @@ public int getSourceInvoiceLine_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_Invoice getSourceInvoice() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_Invoice getSourceInvoice() throws RuntimeException
     {
-		return (org.compiere.model.I_C_Invoice)MTable.get(getCtx(), org.compiere.model.I_C_Invoice.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_Invoice)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_Invoice.Table_Name)
 			.getPO(getSourceInvoice_ID(), get_TrxName());	}
 
 	/** Set Source Invoice.
@@ -716,9 +716,9 @@ public int getSourceInvoice_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_OrderLine getSourceOrderLine() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_OrderLine getSourceOrderLine() throws RuntimeException
     {
-		return (org.compiere.model.I_C_OrderLine)MTable.get(getCtx(), org.compiere.model.I_C_OrderLine.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_OrderLine)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_OrderLine.Table_Name)
 			.getPO(getSourceOrderLine_ID(), get_TrxName());	}
 
 	/** Set Source Order Line.
@@ -741,9 +741,9 @@ public int getSourceOrderLine_ID ()
 		return ii.intValue();
 	}
 
-	public org.compiere.model.I_C_Order getSourceOrder() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_Order getSourceOrder() throws RuntimeException
     {
-		return (org.compiere.model.I_C_Order)MTable.get(getCtx(), org.compiere.model.I_C_Order.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_Order)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_Order.Table_Name)
 			.getPO(getSourceOrder_ID(), get_TrxName());	}
 
 	/** Set Source Order.
@@ -876,9 +876,9 @@ public BigDecimal getWithholdingAmt ()
 		return bd;
 	}
 
-	public org.compiere.model.I_C_Invoice getWithholdingDeclaration() throws RuntimeException
+	public org.adempiere.core.domains.models.I_C_Invoice getWithholdingDeclaration() throws RuntimeException
     {
-		return (org.compiere.model.I_C_Invoice)MTable.get(getCtx(), org.compiere.model.I_C_Invoice.Table_Name)
+		return (org.adempiere.core.domains.models.I_C_Invoice)MTable.get(getCtx(), org.adempiere.core.domains.models.I_C_Invoice.Table_Name)
 			.getPO(getWithholdingDeclaration_ID(), get_TrxName());	}
 
 	/** Set Withholding Declaration.
diff --git a/src/main/java/org/spin/util/WithholdingEngine.java b/src/main/java/org/spin/util/WithholdingEngine.java
index 28ba938..f427b3b 100644
--- a/src/main/java/org/spin/util/WithholdingEngine.java
+++ b/src/main/java/org/spin/util/WithholdingEngine.java
@@ -21,8 +21,8 @@
 import java.util.Map.Entry;
 
 import org.adempiere.exceptions.AdempiereException;
-import org.compiere.model.I_C_DocType;
-import org.compiere.model.I_C_Invoice;
+import org.adempiere.core.domains.models.I_C_DocType;
+import org.adempiere.core.domains.models.I_C_Invoice;
 import org.compiere.model.MDocType;
 import org.compiere.model.ModelValidator;
 import org.compiere.model.PO;
diff --git a/src/main/java/org/spin/withholding/setup/Deploy.java b/src/main/java/org/spin/withholding/setup/Deploy.java
index b927584..4dc27e4 100644
--- a/src/main/java/org/spin/withholding/setup/Deploy.java
+++ b/src/main/java/org/spin/withholding/setup/Deploy.java
@@ -19,7 +19,7 @@
 import java.util.Properties;
 
 import org.compiere.model.Query;
-import org.compiere.model.X_AD_ModelValidator;
+import org.adempiere.core.domains.models.X_AD_ModelValidator;
 import org.spin.model.Withholding;
 import org.spin.util.ISetupDefinition;