diff --git a/org.adempiere.base/.factorypath b/org.adempiere.base/.factorypath
deleted file mode 100644
index 1ae0ba3547..0000000000
--- a/org.adempiere.base/.factorypath
+++ /dev/null
@@ -1,4 +0,0 @@
-<factorypath>
-    <factorypathentry kind="WKSPJAR" id="/org.adempiere.base/lib/classindex.jar" enabled="true" runInBatchMode="true"/>
-    <factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
-</factorypath>
diff --git a/org.adempiere.base/.settings/org.eclipse.jdt.apt.core.prefs b/org.adempiere.base/.settings/org.eclipse.jdt.apt.core.prefs
deleted file mode 100644
index 3a1f4d43db..0000000000
--- a/org.adempiere.base/.settings/org.eclipse.jdt.apt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=true
-org.eclipse.jdt.apt.genSrcDir=.apt_generated
-org.eclipse.jdt.apt.genTestSrcDir=.apt_generated_tests
-org.eclipse.jdt.apt.reconcileEnabled=false
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 9023914ad9..5c0479216a 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ClassPath: .,
  lib/commons-validator.jar,
  lib/cron4j.jar,
  lib/avalon-framework-api.jar,
- lib/classindex.jar
+ lib/classgraph.jar
 Export-Package: bsh,
  bsh.classpath,
  bsh.collection,
@@ -38,7 +38,6 @@ Export-Package: bsh,
  org.adempiere.print.export,
  org.adempiere.process,
  org.adempiere.util,
- org.atteo.classindex,
  org.compiere,
  org.compiere.acct,
  org.compiere.db,
diff --git a/org.adempiere.base/OSGI-INF/defaultmodelfactory.xml b/org.adempiere.base/OSGI-INF/defaultmodelfactory.xml
index a30e945dbc..ec34092107 100644
--- a/org.adempiere.base/OSGI-INF/defaultmodelfactory.xml
+++ b/org.adempiere.base/OSGI-INF/defaultmodelfactory.xml
@@ -4,4 +4,5 @@
    <service>
       <provide interface="org.adempiere.base.IModelFactory"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1"/>
 </scr:component>
diff --git a/org.adempiere.base/OSGI-INF/org.adempiere.base.AnnotationBasedModelFactory.xml b/org.adempiere.base/OSGI-INF/org.adempiere.base.AnnotationBasedModelFactory.xml
index 9a28712678..ef1b4a950d 100644
--- a/org.adempiere.base/OSGI-INF/org.adempiere.base.AnnotationBasedModelFactory.xml
+++ b/org.adempiere.base/OSGI-INF/org.adempiere.base.AnnotationBasedModelFactory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" immediate="true" name="org.adempiere.base.AnnotationBasedModelFactory">
-   <property name="service.ranking" type="Integer" value="-1"/>
+   <property name="service.ranking" type="Integer" value="0"/>
    <service>
       <provide interface="org.adempiere.base.IModelFactory"/>
    </service>
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index 56ff8ad77e..322ef11898 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -7,8 +7,7 @@ bin.includes = plugin.xml,\
                lib/bsh.jar,\
                lib/commons-validator.jar,\
                lib/cron4j.jar,\
-               lib/classindex.jar
+               lib/classgraph.jar
 src.includes = schema/
-source.. = src/,\
-           .apt_generated/
+source.. = src/
 output.. = target/classes/
diff --git a/org.adempiere.base/pom.xml b/org.adempiere.base/pom.xml
index d2f19c8135..93842ace50 100644
--- a/org.adempiere.base/pom.xml
+++ b/org.adempiere.base/pom.xml
@@ -44,9 +44,9 @@
 									<version>4.3.1</version>
 								</artifactItem>
 								<artifactItem>
-									<groupId>org.atteo.classindex</groupId>
-									<artifactId>classindex</artifactId>
-									<version>3.4</version>
+									<groupId>io.github.classgraph</groupId>
+								    <artifactId>classgraph</artifactId>
+								    <version>4.8.116</version>
 								</artifactItem>
 							</artifactItems>
 							<outputDirectory>lib</outputDirectory>
diff --git a/org.adempiere.base/src/org/adempiere/base/AnnotationBasedModelFactory.java b/org.adempiere.base/src/org/adempiere/base/AnnotationBasedModelFactory.java
index 7d2fdc9fa8..6ce294df50 100644
--- a/org.adempiere.base/src/org/adempiere/base/AnnotationBasedModelFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/AnnotationBasedModelFactory.java
@@ -12,70 +12,151 @@
  *****************************************************************************/
 package org.adempiere.base;
 
-import org.atteo.classindex.ClassIndex;
-import org.compiere.util.CCache;
-import org.osgi.framework.Bundle;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
 import org.osgi.framework.wiring.BundleWiring;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 
+import io.github.classgraph.AnnotationInfo;
+import io.github.classgraph.ClassGraph;
+import io.github.classgraph.ClassInfo;
+import io.github.classgraph.ClassInfoList;
+import io.github.classgraph.ScanResult;
+
 /**
  * Translates table names into model classes having the {@link Model} annotation. Relies on
  * {@link DefaultModelFactory} for everything else.
  * This factory is designed to have a service rank higher than {@link DefaultModelFactory}, as class
  * discovery using SPI is preferred over reflection-based methods.
  * @author Saulo Gil
+ * @author Heng Sin
  */
-@Component(immediate = true, service = IModelFactory.class, property = {"service.ranking:Integer=-1"})
+@Component(immediate = true, service = IModelFactory.class, property = {"service.ranking:Integer=0"})
 public class AnnotationBasedModelFactory extends AbstractModelFactory implements IModelFactory
 {
+	/**
+	 * Table name to class cache
+	 */
+	private Map<String,Class<?>> classCache = new HashMap<>();
 
-	private Bundle usingBundle;
+	private final static CLogger s_log = CLogger.getCLogger(AnnotationBasedModelFactory.class);
 
-	private CCache<String,Class<?>> classCache = new CCache<String,Class<?>>(null, "ABMF", 100, 120, false, 2000);
+	/**
+	 * Packages to scan for Core X* classes
+	 */
+	private final static String[] CORE_PACKAGES = new String[] {
+		"org.compiere.model",  "compiere.model", "adempiere.model", "org.adempiere.model",
+		"org.compiere.wf", "org.compiere.print", "org.compiere.impexp",
+		"org.eevolution.model"
+	};
+	
+	/**
+	 * Extension point. Subclasses might override this method in order to have faster
+	 * model class scanning.
+	 * @return array of packages to be accepted during class scanning
+	 * @see ClassGraph#acceptPackagesNonRecursive(String...)
+	 */
+	protected String[] getPackages() {
+		return new String[]{};
+	}
 
+	/**
+	 * Extension point. Provide a list of patterns to match against class names.
+	 * @return array of strings containing patterns
+	 * @see ClassGraph#acceptClasses(String...)
+	 */
+	protected String[] getAcceptClassesPatterns() {
+		String[] patterns = new String[] {"*.X_*"};
+		return patterns;
+	}
+	
 	@Activate
-	void activate(ComponentContext context)
-	{
-		this.usingBundle = context.getUsingBundle();
-	}
+	public void activate(ComponentContext context) throws ClassNotFoundException {
+		long start = System.currentTimeMillis();
+		ClassLoader classLoader = context.getBundleContext().getBundle().adapt(BundleWiring.class).getClassLoader();
 
-	@Override
-	public Class<?> getClass(String tableName) 
-	{
-		// search first into cache
-		Class<?> candidate = classCache.get(tableName);
-		if (candidate != null)
+		ClassGraph graph = new ClassGraph()
+				.enableAnnotationInfo()
+				.overrideClassLoaders(classLoader)
+				.disableJarScanning()
+				.disableNestedJarScanning()
+				.disableModuleScanning();
+
+		// narrow search to a list of packages
+		if(isAtCore())
+			graph.acceptPackagesNonRecursive(CORE_PACKAGES);
+		else
 		{
-			// Object.class indicate no generated PO class for tableName
-			if (candidate.equals(Object.class))
-				return null;
+			String[] packages = getPackages();
+			if(packages==null || packages.length==0)
+				s_log.warning(this.getClass().getSimpleName() + " should override the getPackages method");
 			else
-				return candidate;
+				graph.acceptPackagesNonRecursive(packages);
 		}
 
-		// scan model annotations
-		BundleWiring wiring = usingBundle.adapt(BundleWiring.class);
-		for(Class<?> xClass : ClassIndex.getAnnotated(Model.class, wiring.getClassLoader()))
+		// narrow search to class names matching a set of patterns
+		String[] acceptClasses = getAcceptClassesPatterns();
+		if(acceptClasses!=null && acceptClasses.length > 0)
+			graph.acceptClasses(acceptClasses);
+
+		try (ScanResult scanResult = graph.scan())
 		{
-			Model annotation = xClass.getAnnotation(Model.class);
-			if(annotation.table().equalsIgnoreCase(tableName))
-			{
-				candidate = xClass;
-				for(Class<?> mClass : ClassIndex.getSubclasses(xClass, wiring.getClassLoader())) {
-					if(!mClass.equals(candidate) && candidate.isAssignableFrom(mClass))
-						// favoring candidates higher in the class hierarchy
-						candidate = mClass;
-				}
-				break;
-			}
+
+		    for (ClassInfo classInfo : scanResult.getClassesWithAnnotation(Model.class)) {
+		        String className = classInfo.getName();
+		        AnnotationInfo annotationInfo = classInfo.getAnnotationInfo(Model.class);
+		        String tableName = (String) annotationInfo.getParameterValues().getValue("table");
+
+		        Class<?> existing = classCache.get(tableName);
+
+		        // try to detect M classes only if we found an X class
+		        if(existing == null && className.substring(className.lastIndexOf(".")).startsWith(".X")) {
+			        ClassInfoList subclasses = classInfo.getSubclasses().directOnly();
+			        while(!subclasses.isEmpty()) {
+			        	className = subclasses.get(0).getName();
+			        	subclasses = subclasses.get(0).getSubclasses().directOnly();
+			        }
+		        }
+		        
+		        if(existing==null) {
+		        	classCache.put(tableName, classLoader.loadClass(className));
+		        } else if (className.substring(className.lastIndexOf(".")).startsWith(".M")) {
+		        	if(existing.getSimpleName().startsWith("X_")) {
+		        		classCache.put(tableName, classLoader.loadClass(className));
+		        	} else {
+		        		Class<?> found = classLoader.loadClass(className);
+			        	// replace existing entries only if found class has a lower hierarchy
+			        	if(existing.isAssignableFrom(found))
+			        		classCache.put(tableName, classLoader.loadClass(className));
+		        	}
+		        }
+		    }
 		}
-
-		//Object.class to indicate no PO class for tableName
-		classCache.put(tableName, candidate == null ? Object.class : candidate);
-
-		return candidate;
+		long end = System.currentTimeMillis();
+		if (s_log.isLoggable(Level.INFO))
+			s_log.info(this.getClass().getSimpleName() + " loaded "+classCache.size() +" classes in "
+					+((end-start)/1000f) + "s");
 	}
 
-}
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Class<?> getClass(String tableName) {
+		return classCache.get(tableName);
+	}
+
+	/**
+	 * Tells whether we're executing code from a subclass of {@link AnnotationBasedModelFactory}.
+	 * @return
+	 */
+	private boolean isAtCore() {
+		return getClass().equals(AnnotationBasedModelFactory.class);
+	}
+
+}
\ No newline at end of file
diff --git a/org.adempiere.base/src/org/adempiere/base/Model.java b/org.adempiere.base/src/org/adempiere/base/Model.java
index 5d77e4c3d1..56059c903f 100644
--- a/org.adempiere.base/src/org/adempiere/base/Model.java
+++ b/org.adempiere.base/src/org/adempiere/base/Model.java
@@ -13,17 +13,16 @@
 package org.adempiere.base;
 
 import static java.lang.annotation.ElementType.TYPE;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.atteo.classindex.IndexAnnotated;
 
 /**
  * Automatic model class registration
  * @author Saulo Gil
  */
 @Target(TYPE)
-@IndexAnnotated
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Model {
 
diff --git a/org.adempiere.base/src/org/adempiere/util/ModelClassGenerator.java b/org.adempiere.base/src/org/adempiere/util/ModelClassGenerator.java
index 0866571b5c..0282c03b6d 100644
--- a/org.adempiere.base/src/org/adempiere/util/ModelClassGenerator.java
+++ b/org.adempiere.base/src/org/adempiere/util/ModelClassGenerator.java
@@ -161,7 +161,6 @@ public class ModelClassGenerator
 
 		addImportClass(java.util.Properties.class);
 		addImportClass(java.sql.ResultSet.class);
-		addImportClass("org.atteo.classindex.IndexSubclasses");
 		if (!packageName.equals("org.compiere.model"))
 			addImportClass("org.compiere.model.*");
 		createImports(start);
@@ -169,7 +168,6 @@ public class ModelClassGenerator
 		start.append("/** Generated Model for ").append(tableName).append(NL)
 			 .append(" *  @author iDempiere (generated) ").append(NL)
 			 .append(" *  @version ").append(Adempiere.MAIN_VERSION).append(" - $Id$ */").append(NL)
-			 .append("@IndexSubclasses").append(NL)
 			 .append("@org.adempiere.base.Model(table=\"").append(tableName).append("\")").append(NL)
 			 .append("public class ").append(className)
 			 	.append(" extends PO")
diff --git a/org.adempiere.base/src/org/compiere/model/MTree.java b/org.adempiere.base/src/org/compiere/model/MTree.java
index 4abc8fe1f3..6de50d774a 100644
--- a/org.adempiere.base/src/org/compiere/model/MTree.java
+++ b/org.adempiere.base/src/org/compiere/model/MTree.java
@@ -63,6 +63,18 @@ public class MTree extends MTree_Base
 		super (ctx, AD_Tree_ID, trxName);
 	}   //  MTree
 
+	/**
+	 * Resultset constructor for model factory.
+	 * Need to call loadNodes explicitly
+	 * @param ctx
+	 * @param rs
+	 * @param trxName
+	 */	
+	public MTree (Properties ctx, ResultSet rs, String trxName) 
+	{
+		super(ctx, rs, trxName);
+	}
+
 	/**
 	 *  Construct & Load Tree
 	 *  @param AD_Tree_ID   The tree to build
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AccessLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_AccessLog.java
index 5bd8a7481f..2e5a6a1b38 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AccessLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AccessLog.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AccessLog
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_AccessLog")
 public class X_AD_AccessLog extends PO implements I_AD_AccessLog, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Alert.java b/org.adempiere.base/src/org/compiere/model/X_AD_Alert.java
index 02295b0091..85a35931ae 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Alert.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Alert.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Alert
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Alert")
 public class X_AD_Alert extends PO implements I_AD_Alert, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessor.java b/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessor.java
index 982f0876ad..397ff7bcf9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessor.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AlertProcessor
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_AlertProcessor")
 public class X_AD_AlertProcessor extends PO implements I_AD_AlertProcessor, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessorLog.java
index 445a9cb485..21ad096c47 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AlertProcessorLog.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_AlertProcessorLog
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_AlertProcessorLog")
 public class X_AD_AlertProcessorLog extends PO implements I_AD_AlertProcessorLog, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AlertRecipient.java b/org.adempiere.base/src/org/compiere/model/X_AD_AlertRecipient.java
index a4d62fcb5b..9f3b43d548 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AlertRecipient.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AlertRecipient.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AlertRecipient
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_AlertRecipient")
 public class X_AD_AlertRecipient extends PO implements I_AD_AlertRecipient, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AlertRule.java b/org.adempiere.base/src/org/compiere/model/X_AD_AlertRule.java
index 222571ad27..f2b866a253 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AlertRule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AlertRule.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AlertRule
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_AlertRule")
 public class X_AD_AlertRule extends PO implements I_AD_AlertRule, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AllClients_V.java b/org.adempiere.base/src/org/compiere/model/X_AD_AllClients_V.java
index 13878c6f39..0e12477ebf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AllClients_V.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AllClients_V.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_AllClients_V
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_AllClients_V")
 public class X_AD_AllClients_V extends PO implements I_AD_AllClients_V, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AllUsers_V.java b/org.adempiere.base/src/org/compiere/model/X_AD_AllUsers_V.java
index 3e90184f5b..9a3d8da439 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AllUsers_V.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AllUsers_V.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_AllUsers_V
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_AllUsers_V")
 public class X_AD_AllUsers_V extends PO implements I_AD_AllUsers_V, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Archive.java b/org.adempiere.base/src/org/compiere/model/X_AD_Archive.java
index 1ee64c7120..ed54c2e650 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Archive.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Archive.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Archive
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Archive")
 public class X_AD_Archive extends PO implements I_AD_Archive, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Attachment.java b/org.adempiere.base/src/org/compiere/model/X_AD_Attachment.java
index efe9bd2c23..b6d7dee395 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Attachment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Attachment.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Attachment
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Attachment")
 public class X_AD_Attachment extends PO implements I_AD_Attachment, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AttachmentNote.java b/org.adempiere.base/src/org/compiere/model/X_AD_AttachmentNote.java
index a9f184fc8b..3542288dd1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AttachmentNote.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AttachmentNote.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AttachmentNote
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_AttachmentNote")
 public class X_AD_AttachmentNote extends PO implements I_AD_AttachmentNote, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Attribute.java b/org.adempiere.base/src/org/compiere/model/X_AD_Attribute.java
index 0aa0f5761a..b380c162d7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Attribute.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Attribute.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Attribute
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Attribute")
 public class X_AD_Attribute extends PO implements I_AD_Attribute, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Attribute_Value.java b/org.adempiere.base/src/org/compiere/model/X_AD_Attribute_Value.java
index 82d5081d55..17fed7fc8c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Attribute_Value.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Attribute_Value.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Attribute_Value
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Attribute_Value")
 public class X_AD_Attribute_Value extends PO implements I_AD_Attribute_Value, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationAccount.java b/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationAccount.java
index dbd2c928a3..3e35846273 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationAccount.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationAccount.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for AD_AuthorizationAccount
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_AuthorizationAccount")
 public class X_AD_AuthorizationAccount extends PO implements I_AD_AuthorizationAccount, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationCredential.java b/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationCredential.java
index 72bc7ded76..7212571283 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationCredential.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationCredential.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AuthorizationCredential
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_AuthorizationCredential")
 public class X_AD_AuthorizationCredential extends PO implements I_AD_AuthorizationCredential, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationProvider.java b/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationProvider.java
index 0bfb90c666..b47259d412 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationProvider.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationProvider.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_AuthorizationProvider
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_AuthorizationProvider")
 public class X_AD_AuthorizationProvider extends PO implements I_AD_AuthorizationProvider, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationScopeProv.java b/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationScopeProv.java
index d2f0700f28..88d2b4a6f0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationScopeProv.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_AuthorizationScopeProv.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_AuthorizationScopeProv
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_AuthorizationScopeProv")
 public class X_AD_AuthorizationScopeProv extends PO implements I_AD_AuthorizationScopeProv, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_BroadcastMessage.java b/org.adempiere.base/src/org/compiere/model/X_AD_BroadcastMessage.java
index b3a6158b71..fc4f9a60b6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_BroadcastMessage.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_BroadcastMessage.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_BroadcastMessage
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_BroadcastMessage")
 public class X_AD_BroadcastMessage extends PO implements I_AD_BroadcastMessage, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ChangeLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_ChangeLog.java
index 277a93cf8e..d444541ebd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ChangeLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ChangeLog.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ChangeLog
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ChangeLog")
 public class X_AD_ChangeLog extends PO implements I_AD_ChangeLog, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Chart.java b/org.adempiere.base/src/org/compiere/model/X_AD_Chart.java
index bac831d80b..c39a795a62 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Chart.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Chart.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Chart
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Chart")
 public class X_AD_Chart extends PO implements I_AD_Chart, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ChartDatasource.java b/org.adempiere.base/src/org/compiere/model/X_AD_ChartDatasource.java
index 078e1e3039..d485749ca2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ChartDatasource.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ChartDatasource.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ChartDatasource
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ChartDatasource")
 public class X_AD_ChartDatasource extends PO implements I_AD_ChartDatasource, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Client.java b/org.adempiere.base/src/org/compiere/model/X_AD_Client.java
index 6e84751a6a..d92a2189a5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Client.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Client.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Client
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Client")
 public class X_AD_Client extends PO implements I_AD_Client, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ClientInfo.java b/org.adempiere.base/src/org/compiere/model/X_AD_ClientInfo.java
index 72d1a2f21e..f464d485c4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ClientInfo.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ClientInfo.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_ClientInfo
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ClientInfo")
 public class X_AD_ClientInfo extends PO implements I_AD_ClientInfo, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ClientShare.java b/org.adempiere.base/src/org/compiere/model/X_AD_ClientShare.java
index acfbd3bd0b..00fc1a59d9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ClientShare.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ClientShare.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ClientShare
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ClientShare")
 public class X_AD_ClientShare extends PO implements I_AD_ClientShare, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Color.java b/org.adempiere.base/src/org/compiere/model/X_AD_Color.java
index d72aaeea45..03ec0ba419 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Color.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Color.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Color
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Color")
 public class X_AD_Color extends PO implements I_AD_Color, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Column.java b/org.adempiere.base/src/org/compiere/model/X_AD_Column.java
index a3944ffffa..60a86847f3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Column.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Column.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Column
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Column")
 public class X_AD_Column extends PO implements I_AD_Column, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Column_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Column_Access.java
index 3377072212..1be6939567 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Column_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Column_Access.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Column_Access
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Column_Access")
 public class X_AD_Column_Access extends PO implements I_AD_Column_Access, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelp.java b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelp.java
index b27231e9bc..c5476c8382 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelp.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelp.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_CtxHelp
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_CtxHelp")
 public class X_AD_CtxHelp extends PO implements I_AD_CtxHelp, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpMsg.java b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpMsg.java
index 5ec18f6c44..32cbeb7c5a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpMsg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpMsg.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_CtxHelpMsg
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_CtxHelpMsg")
 public class X_AD_CtxHelpMsg extends PO implements I_AD_CtxHelpMsg, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpSuggestion.java b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpSuggestion.java
index 90fe8f5b67..ad8b369e63 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpSuggestion.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpSuggestion.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_CtxHelpSuggestion
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_CtxHelpSuggestion")
 public class X_AD_CtxHelpSuggestion extends PO implements I_AD_CtxHelpSuggestion, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Desktop.java b/org.adempiere.base/src/org/compiere/model/X_AD_Desktop.java
index bec378ad1b..94336111ba 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Desktop.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Desktop.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Desktop
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Desktop")
 public class X_AD_Desktop extends PO implements I_AD_Desktop, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_DesktopWorkbench.java b/org.adempiere.base/src/org/compiere/model/X_AD_DesktopWorkbench.java
index 859cfae968..47bfb1eb9e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_DesktopWorkbench.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_DesktopWorkbench.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_DesktopWorkbench
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_DesktopWorkbench")
 public class X_AD_DesktopWorkbench extends PO implements I_AD_DesktopWorkbench, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Document_Action_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Document_Action_Access.java
index c240de8c25..f81894ca01 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Document_Action_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Document_Action_Access.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Document_Action_Access
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Document_Action_Access")
 public class X_AD_Document_Action_Access extends PO implements I_AD_Document_Action_Access, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Element.java b/org.adempiere.base/src/org/compiere/model/X_AD_Element.java
index ebd5b7cb59..3aa48ecdeb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Element.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Element.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Element
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Element")
 public class X_AD_Element extends PO implements I_AD_Element, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_EntityType.java b/org.adempiere.base/src/org/compiere/model/X_AD_EntityType.java
index d452ab24c4..c1196fc4f3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_EntityType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_EntityType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_EntityType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_EntityType")
 public class X_AD_EntityType extends PO implements I_AD_EntityType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Error.java b/org.adempiere.base/src/org/compiere/model/X_AD_Error.java
index 472115da15..ae74dc4357 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Error.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Error.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Error
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Error")
 public class X_AD_Error extends PO implements I_AD_Error, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Field.java b/org.adempiere.base/src/org/compiere/model/X_AD_Field.java
index 782d754964..1854dabf89 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Field.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Field.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Field
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Field")
 public class X_AD_Field extends PO implements I_AD_Field, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_FieldGroup.java b/org.adempiere.base/src/org/compiere/model/X_AD_FieldGroup.java
index adec5dd461..2cbacf8f36 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_FieldGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_FieldGroup.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_FieldGroup
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_FieldGroup")
 public class X_AD_FieldGroup extends PO implements I_AD_FieldGroup, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_FieldSuggestion.java b/org.adempiere.base/src/org/compiere/model/X_AD_FieldSuggestion.java
index 510560c8c6..2232ddfd94 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_FieldSuggestion.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_FieldSuggestion.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_FieldSuggestion
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_FieldSuggestion")
 public class X_AD_FieldSuggestion extends PO implements I_AD_FieldSuggestion, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Find.java b/org.adempiere.base/src/org/compiere/model/X_AD_Find.java
index 375f43e162..d29d5b8548 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Find.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Find.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Find
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Find")
 public class X_AD_Find extends PO implements I_AD_Find, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Form.java b/org.adempiere.base/src/org/compiere/model/X_AD_Form.java
index e5cadbece4..fc0b56a2f6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Form.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Form.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Form
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Form")
 public class X_AD_Form extends PO implements I_AD_Form, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Form_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Form_Access.java
index b03abdd5c9..7d74f7de0a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Form_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Form_Access.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Form_Access
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Form_Access")
 public class X_AD_Form_Access extends PO implements I_AD_Form_Access, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_HouseKeeping.java b/org.adempiere.base/src/org/compiere/model/X_AD_HouseKeeping.java
index 2958967501..2827eb18d5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_HouseKeeping.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_HouseKeeping.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_HouseKeeping
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_HouseKeeping")
 public class X_AD_HouseKeeping extends PO implements I_AD_HouseKeeping, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Image.java b/org.adempiere.base/src/org/compiere/model/X_AD_Image.java
index e66677cc18..3ef555e820 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Image.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Image.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Image
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Image")
 public class X_AD_Image extends PO implements I_AD_Image, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat.java b/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat.java
index 0ed48ed2b2..6798749eba 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ImpFormat
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ImpFormat")
 public class X_AD_ImpFormat extends PO implements I_AD_ImpFormat, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat_Row.java b/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat_Row.java
index 91bf16a3d9..0397488cfc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat_Row.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ImpFormat_Row.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ImpFormat_Row
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ImpFormat_Row")
 public class X_AD_ImpFormat_Row extends PO implements I_AD_ImpFormat_Row, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplate.java b/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplate.java
index 8835ea035f..6ed491fdbb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplate.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ImportTemplate
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ImportTemplate")
 public class X_AD_ImportTemplate extends PO implements I_AD_ImportTemplate, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplateAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplateAccess.java
index b048614b30..ba7d282c46 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplateAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ImportTemplateAccess.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_ImportTemplateAccess
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ImportTemplateAccess")
 public class X_AD_ImportTemplateAccess extends PO implements I_AD_ImportTemplateAccess, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_IndexColumn.java b/org.adempiere.base/src/org/compiere/model/X_AD_IndexColumn.java
index ae58cc62bb..6301074b7f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_IndexColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_IndexColumn.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_IndexColumn
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_IndexColumn")
 public class X_AD_IndexColumn extends PO implements I_AD_IndexColumn, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoColumn.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoColumn.java
index 60ffe64807..a9503790a4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoColumn.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_InfoColumn
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_InfoColumn")
 public class X_AD_InfoColumn extends PO implements I_AD_InfoColumn, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java
index cde2598fe2..7b271bddb1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_InfoProcess
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_InfoProcess")
 public class X_AD_InfoProcess extends PO implements I_AD_InfoProcess, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoRelated.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoRelated.java
index 8d9ccc65ab..d1b7955385 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoRelated.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoRelated.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_InfoRelated
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_InfoRelated")
 public class X_AD_InfoRelated extends PO implements I_AD_InfoRelated, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java
index b0e9ce7356..95ebbb502d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_InfoWindow
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_InfoWindow")
 public class X_AD_InfoWindow extends PO implements I_AD_InfoWindow, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow_Access.java
index f88bd701f9..1a4bda1850 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow_Access.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_InfoWindow_Access
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_InfoWindow_Access")
 public class X_AD_InfoWindow_Access extends PO implements I_AD_InfoWindow_Access, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Issue.java b/org.adempiere.base/src/org/compiere/model/X_AD_Issue.java
index 74e4efe29d..d0058a2e36 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Issue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Issue.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Issue
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Issue")
 public class X_AD_Issue extends PO implements I_AD_Issue, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinter.java b/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinter.java
index 05142b078a..d393c278e7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinter.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinter.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_LabelPrinter
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_LabelPrinter")
 public class X_AD_LabelPrinter extends PO implements I_AD_LabelPrinter, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinterFunction.java b/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinterFunction.java
index 7bbb2a6555..769355e730 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinterFunction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_LabelPrinterFunction.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_LabelPrinterFunction
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_LabelPrinterFunction")
 public class X_AD_LabelPrinterFunction extends PO implements I_AD_LabelPrinterFunction, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Language.java b/org.adempiere.base/src/org/compiere/model/X_AD_Language.java
index c183dc0d20..c265b007a8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Language.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Language.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Language
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Language")
 public class X_AD_Language extends PO implements I_AD_Language, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_LdapAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_LdapAccess.java
index 9753d4a962..218270ff34 100755
--- a/org.adempiere.base/src/org/compiere/model/X_AD_LdapAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_LdapAccess.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_LdapAccess
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_LdapAccess")
 public class X_AD_LdapAccess extends PO implements I_AD_LdapAccess, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessor.java b/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessor.java
index 4d52863e86..3057d4a105 100755
--- a/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessor.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_LdapProcessor
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_LdapProcessor")
 public class X_AD_LdapProcessor extends PO implements I_AD_LdapProcessor, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessorLog.java
index e975a10b11..bdab98ca05 100755
--- a/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_LdapProcessorLog.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_LdapProcessorLog
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_LdapProcessorLog")
 public class X_AD_LdapProcessorLog extends PO implements I_AD_LdapProcessorLog, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Menu.java b/org.adempiere.base/src/org/compiere/model/X_AD_Menu.java
index 59efd38d58..b6e76a4a5c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Menu.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Menu.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Menu
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Menu")
 public class X_AD_Menu extends PO implements I_AD_Menu, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Message.java b/org.adempiere.base/src/org/compiere/model/X_AD_Message.java
index 3c39c37b28..ac18ebbddc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Message.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Message.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Message
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Message")
 public class X_AD_Message extends PO implements I_AD_Message, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_MigrationScript.java b/org.adempiere.base/src/org/compiere/model/X_AD_MigrationScript.java
index 7e054c18fe..8d0d94ad4a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_MigrationScript.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_MigrationScript.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_MigrationScript
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_MigrationScript")
 public class X_AD_MigrationScript extends PO implements I_AD_MigrationScript, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ModelValidator.java b/org.adempiere.base/src/org/compiere/model/X_AD_ModelValidator.java
index d0dae5cb96..e243160576 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ModelValidator.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ModelValidator.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ModelValidator
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ModelValidator")
 public class X_AD_ModelValidator extends PO implements I_AD_ModelValidator, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Modification.java b/org.adempiere.base/src/org/compiere/model/X_AD_Modification.java
index 0dcd5611a2..32922483e5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Modification.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Modification.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Modification
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Modification")
 public class X_AD_Modification extends PO implements I_AD_Modification, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Note.java b/org.adempiere.base/src/org/compiere/model/X_AD_Note.java
index b6d6c37c72..6963083a31 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Note.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Note.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Note
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Note")
 public class X_AD_Note extends PO implements I_AD_Note, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Org.java b/org.adempiere.base/src/org/compiere/model/X_AD_Org.java
index 884bdf187b..feee5397bb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Org.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Org.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Org
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Org")
 public class X_AD_Org extends PO implements I_AD_Org, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_OrgInfo.java b/org.adempiere.base/src/org/compiere/model/X_AD_OrgInfo.java
index 29c2158354..138a801900 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_OrgInfo.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_OrgInfo.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_OrgInfo
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_OrgInfo")
 public class X_AD_OrgInfo extends PO implements I_AD_OrgInfo, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_OrgType.java b/org.adempiere.base/src/org/compiere/model/X_AD_OrgType.java
index 779e62d511..3489d25ef2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_OrgType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_OrgType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_OrgType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_OrgType")
 public class X_AD_OrgType extends PO implements I_AD_OrgType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PInstance.java b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance.java
index e9b868a07f..886f9f72f9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PInstance
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PInstance")
 public class X_AD_PInstance extends PO implements I_AD_PInstance, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Log.java b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Log.java
index 938f9eb6b8..5565556803 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Log.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Log.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for AD_PInstance_Log
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PInstance_Log")
 public class X_AD_PInstance_Log extends PO implements I_AD_PInstance_Log, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Para.java b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Para.java
index b3087bc9a0..cb6b728261 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PInstance_Para.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PInstance_Para
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PInstance_Para")
 public class X_AD_PInstance_Para extends PO implements I_AD_PInstance_Para, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp.java
index 34b5952ec7..72c454cf7f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Exp
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Package_Exp")
 public class X_AD_Package_Exp extends PO implements I_AD_Package_Exp, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp_Detail.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp_Detail.java
index 5e727cd86c..e7c79b65ba 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp_Detail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Exp_Detail.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Exp_Detail
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Package_Exp_Detail")
 public class X_AD_Package_Exp_Detail extends PO implements I_AD_Package_Exp_Detail, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp.java
index e862a10598..79edbaea86 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Imp
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Package_Imp")
 public class X_AD_Package_Imp extends PO implements I_AD_Package_Imp, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Backup.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Backup.java
index 3387f6bc07..703effb755 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Backup.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Backup.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Imp_Backup
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Package_Imp_Backup")
 public class X_AD_Package_Imp_Backup extends PO implements I_AD_Package_Imp_Backup, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Detail.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Detail.java
index e0d01014b6..5ba098e5fe 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Detail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Detail.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Package_Imp_Detail
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Package_Imp_Detail")
 public class X_AD_Package_Imp_Detail extends PO implements I_AD_Package_Imp_Detail, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Inst.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Inst.java
index 83db8010e9..26c001dc20 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Inst.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Inst.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_Imp_Inst
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Package_Imp_Inst")
 public class X_AD_Package_Imp_Inst extends PO implements I_AD_Package_Imp_Inst, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Proc.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Proc.java
index 443f1d91f1..a0c2043d42 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Proc.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_Imp_Proc.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Package_Imp_Proc
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Package_Imp_Proc")
 public class X_AD_Package_Imp_Proc extends PO implements I_AD_Package_Imp_Proc, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Package_UUID_Map.java b/org.adempiere.base/src/org/compiere/model/X_AD_Package_UUID_Map.java
index eed9c3b107..6a835345b4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Package_UUID_Map.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Package_UUID_Map.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Package_UUID_Map
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Package_UUID_Map")
 public class X_AD_Package_UUID_Map extends PO implements I_AD_Package_UUID_Map, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PasswordRule.java b/org.adempiere.base/src/org/compiere/model/X_AD_PasswordRule.java
index ef6c0d7227..2751d0164b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PasswordRule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PasswordRule.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PasswordRule
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PasswordRule")
 public class X_AD_PasswordRule extends PO implements I_AD_PasswordRule, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Password_History.java b/org.adempiere.base/src/org/compiere/model/X_AD_Password_History.java
index a0de1c5c29..edd39ee79b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Password_History.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Password_History.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Password_History
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Password_History")
 public class X_AD_Password_History extends PO implements I_AD_Password_History, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PostIt.java b/org.adempiere.base/src/org/compiere/model/X_AD_PostIt.java
index 6a64c77e07..78765346c7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PostIt.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PostIt.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_PostIt
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PostIt")
 public class X_AD_PostIt extends PO implements I_AD_PostIt, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Preference.java b/org.adempiere.base/src/org/compiere/model/X_AD_Preference.java
index 0332723e12..dcfe005fac 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Preference.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Preference.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Preference
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Preference")
 public class X_AD_Preference extends PO implements I_AD_Preference, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintColor.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintColor.java
index 2b6b64d2be..999e4cf330 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintColor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintColor.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintColor
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PrintColor")
 public class X_AD_PrintColor extends PO implements I_AD_PrintColor, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintFont.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFont.java
index af84f6f8ba..4abea392a6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintFont.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFont.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintFont
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PrintFont")
 public class X_AD_PrintFont extends PO implements I_AD_PrintFont, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintForm.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintForm.java
index bde24ac7c3..5fa1ede774 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintForm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintForm.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintForm
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PrintForm")
 public class X_AD_PrintForm extends PO implements I_AD_PrintForm, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormat.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormat.java
index fd90511d09..58a56b2b03 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormat.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormat.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintFormat
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PrintFormat")
 public class X_AD_PrintFormat extends PO implements I_AD_PrintFormat, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormatItem.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormatItem.java
index 2b84b4dfee..5fc55692d4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormatItem.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintFormatItem.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintFormatItem
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PrintFormatItem")
 public class X_AD_PrintFormatItem extends PO implements I_AD_PrintFormatItem, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintGraph.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintGraph.java
index 92139c9e9e..48d49b2af5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintGraph.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintGraph.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintGraph
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PrintGraph")
 public class X_AD_PrintGraph extends PO implements I_AD_PrintGraph, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintHeaderFooter.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintHeaderFooter.java
index f4396fd491..298c052343 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintHeaderFooter.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintHeaderFooter.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintHeaderFooter
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PrintHeaderFooter")
 public class X_AD_PrintHeaderFooter extends PO implements I_AD_PrintHeaderFooter, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabel.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabel.java
index 18a9eb063f..c947a3f923 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabel.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabel.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintLabel
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PrintLabel")
 public class X_AD_PrintLabel extends PO implements I_AD_PrintLabel, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabelLine.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabelLine.java
index 67fb52944b..dced2cef90 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabelLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintLabelLine.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintLabelLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PrintLabelLine")
 public class X_AD_PrintLabelLine extends PO implements I_AD_PrintLabelLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintPaper.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintPaper.java
index 256a70a4d3..c49f980a59 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintPaper.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintPaper.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintPaper
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PrintPaper")
 public class X_AD_PrintPaper extends PO implements I_AD_PrintPaper, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_PrintTableFormat.java b/org.adempiere.base/src/org/compiere/model/X_AD_PrintTableFormat.java
index 0f2b89c748..4410d5c0c3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_PrintTableFormat.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_PrintTableFormat.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_PrintTableFormat
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_PrintTableFormat")
 public class X_AD_PrintTableFormat extends PO implements I_AD_PrintTableFormat, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Private_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Private_Access.java
index f3204531f1..b79ab233e9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Private_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Private_Access.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Private_Access
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Private_Access")
 public class X_AD_Private_Access extends PO implements I_AD_Private_Access, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Process.java b/org.adempiere.base/src/org/compiere/model/X_AD_Process.java
index 21de553169..e8759679a1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Process.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Process.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Process
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Process")
 public class X_AD_Process extends PO implements I_AD_Process, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Process_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Process_Access.java
index c346a31695..94628edaff 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Process_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Process_Access.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Process_Access
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Process_Access")
 public class X_AD_Process_Access extends PO implements I_AD_Process_Access, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Process_Para.java b/org.adempiere.base/src/org/compiere/model/X_AD_Process_Para.java
index 7371ca83ac..679d14576c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Process_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Process_Para.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Process_Para
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Process_Para")
 public class X_AD_Process_Para extends PO implements I_AD_Process_Para, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_RecentItem.java b/org.adempiere.base/src/org/compiere/model/X_AD_RecentItem.java
index 956146bc8f..006df0153f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_RecentItem.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_RecentItem.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_RecentItem
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_RecentItem")
 public class X_AD_RecentItem extends PO implements I_AD_RecentItem, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Record_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Record_Access.java
index 338bab8107..cdc222a72d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Record_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Record_Access.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Record_Access
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Record_Access")
 public class X_AD_Record_Access extends PO implements I_AD_Record_Access, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Ref_List.java b/org.adempiere.base/src/org/compiere/model/X_AD_Ref_List.java
index 170d205f3a..7734e7cfc2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Ref_List.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Ref_List.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Ref_List
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Ref_List")
 public class X_AD_Ref_List extends PO implements I_AD_Ref_List, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Ref_Table.java b/org.adempiere.base/src/org/compiere/model/X_AD_Ref_Table.java
index e0491cc3ca..273d4e4ffa 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Ref_Table.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Ref_Table.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Ref_Table
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Ref_Table")
 public class X_AD_Ref_Table extends PO implements I_AD_Ref_Table, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Reference.java b/org.adempiere.base/src/org/compiere/model/X_AD_Reference.java
index c292d6e44d..ab413c9641 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Reference.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Reference.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Reference
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Reference")
 public class X_AD_Reference extends PO implements I_AD_Reference, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Registration.java b/org.adempiere.base/src/org/compiere/model/X_AD_Registration.java
index 92892f4cd5..7ebc8d6d2e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Registration.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Registration.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Registration
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Registration")
 public class X_AD_Registration extends PO implements I_AD_Registration, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_RelationType.java b/org.adempiere.base/src/org/compiere/model/X_AD_RelationType.java
index c4f8521fba..a210103bd2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_RelationType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_RelationType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_RelationType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_RelationType")
 public class X_AD_RelationType extends PO implements I_AD_RelationType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Replication.java b/org.adempiere.base/src/org/compiere/model/X_AD_Replication.java
index 56e14139ae..aa11e12a86 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Replication.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Replication.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Replication
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Replication")
 public class X_AD_Replication extends PO implements I_AD_Replication, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationDocument.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationDocument.java
index 434edaeae2..8bc638c6f0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationDocument.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationDocument.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_ReplicationDocument
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ReplicationDocument")
 public class X_AD_ReplicationDocument extends PO implements I_AD_ReplicationDocument, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationStrategy.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationStrategy.java
index e33c29916a..bd988c4024 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationStrategy.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationStrategy.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ReplicationStrategy
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ReplicationStrategy")
 public class X_AD_ReplicationStrategy extends PO implements I_AD_ReplicationStrategy, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationTable.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationTable.java
index d1e33839c4..4478ac09e6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationTable.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ReplicationTable.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ReplicationTable
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ReplicationTable")
 public class X_AD_ReplicationTable extends PO implements I_AD_ReplicationTable, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Log.java b/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Log.java
index c2f7663950..7985145fc0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Log.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Log.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Replication_Log
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Replication_Log")
 public class X_AD_Replication_Log extends PO implements I_AD_Replication_Log, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Run.java b/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Run.java
index babcf29e5b..22217524fb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Run.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Replication_Run.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Replication_Run
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Replication_Run")
 public class X_AD_Replication_Run extends PO implements I_AD_Replication_Run, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ReportView.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView.java
index 4f44a5ce4d..1166bda9f5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ReportView.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ReportView
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ReportView")
 public class X_AD_ReportView extends PO implements I_AD_ReportView, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Col.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Col.java
index 35f4cb708a..99484f5557 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Col.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Col.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ReportView_Col
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ReportView_Col")
 public class X_AD_ReportView_Col extends PO implements I_AD_ReportView_Col, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Column.java b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Column.java
index 5c47ea9254..22b266240c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Column.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ReportView_Column.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_ReportView_Column
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ReportView_Column")
 public class X_AD_ReportView_Column extends PO implements I_AD_ReportView_Column, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Role.java b/org.adempiere.base/src/org/compiere/model/X_AD_Role.java
index e4e50c1e90..1d933ac924 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Role.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Role.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Role
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Role")
 public class X_AD_Role extends PO implements I_AD_Role, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Role_Included.java b/org.adempiere.base/src/org/compiere/model/X_AD_Role_Included.java
index d558bf546e..6612dd6336 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Role_Included.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Role_Included.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Role_Included
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Role_Included")
 public class X_AD_Role_Included extends PO implements I_AD_Role_Included, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Role_OrgAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_Role_OrgAccess.java
index 6984f562cc..e2927ef1fe 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Role_OrgAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Role_OrgAccess.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Role_OrgAccess
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Role_OrgAccess")
 public class X_AD_Role_OrgAccess extends PO implements I_AD_Role_OrgAccess, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Rule.java b/org.adempiere.base/src/org/compiere/model/X_AD_Rule.java
index f7f5d2967e..5fedddbc96 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Rule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Rule.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Rule
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Rule")
 public class X_AD_Rule extends PO implements I_AD_Rule, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Schedule.java b/org.adempiere.base/src/org/compiere/model/X_AD_Schedule.java
index 0cb835cf9a..ad9ab42b8d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Schedule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Schedule.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Schedule
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Schedule")
 public class X_AD_Schedule extends PO implements I_AD_Schedule, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler.java b/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler.java
index ff97bad9b2..8d01c1ba74 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Scheduler
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Scheduler")
 public class X_AD_Scheduler extends PO implements I_AD_Scheduler, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerLog.java
index 3feb79358d..b2d552386c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerLog.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_SchedulerLog
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_SchedulerLog")
 public class X_AD_SchedulerLog extends PO implements I_AD_SchedulerLog, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerRecipient.java b/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerRecipient.java
index fa9236afb0..f579b76cd3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerRecipient.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_SchedulerRecipient.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_SchedulerRecipient
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_SchedulerRecipient")
 public class X_AD_SchedulerRecipient extends PO implements I_AD_SchedulerRecipient, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler_Para.java b/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler_Para.java
index 2375dbe61e..2556646214 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Scheduler_Para.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Scheduler_Para
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Scheduler_Para")
 public class X_AD_Scheduler_Para extends PO implements I_AD_Scheduler_Para, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_SearchDefinition.java b/org.adempiere.base/src/org/compiere/model/X_AD_SearchDefinition.java
index f4e099504e..bf6135368c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_SearchDefinition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_SearchDefinition.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_SearchDefinition
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_SearchDefinition")
 public class X_AD_SearchDefinition extends PO implements I_AD_SearchDefinition, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Sequence.java b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence.java
index 9ac9ae245b..7ace45ddc0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Sequence.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Sequence
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Sequence")
 public class X_AD_Sequence extends PO implements I_AD_Sequence, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_Audit.java b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_Audit.java
index cff9f78793..819d9eda09 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_Audit.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_Audit.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Sequence_Audit
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Sequence_Audit")
 public class X_AD_Sequence_Audit extends PO implements I_AD_Sequence_Audit, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_No.java b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_No.java
index 2e43b1d777..d84c491d2a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_No.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Sequence_No.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Sequence_No
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Sequence_No")
 public class X_AD_Sequence_No extends PO implements I_AD_Sequence_No, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Session.java b/org.adempiere.base/src/org/compiere/model/X_AD_Session.java
index e467c855df..7f57d200a4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Session.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Session.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Session
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Session")
 public class X_AD_Session extends PO implements I_AD_Session, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_StatusLine.java b/org.adempiere.base/src/org/compiere/model/X_AD_StatusLine.java
index ef52217500..671cae6d8f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_StatusLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_StatusLine.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_StatusLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_StatusLine")
 public class X_AD_StatusLine extends PO implements I_AD_StatusLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_StatusLineUsedIn.java b/org.adempiere.base/src/org/compiere/model/X_AD_StatusLineUsedIn.java
index 87649c5a7d..cc1f7a2d22 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_StatusLineUsedIn.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_StatusLineUsedIn.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_StatusLineUsedIn
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_StatusLineUsedIn")
 public class X_AD_StatusLineUsedIn extends PO implements I_AD_StatusLineUsedIn, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_StorageProvider.java b/org.adempiere.base/src/org/compiere/model/X_AD_StorageProvider.java
index 592dda12ed..f95b72db98 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_StorageProvider.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_StorageProvider.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_StorageProvider
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_StorageProvider")
 public class X_AD_StorageProvider extends PO implements I_AD_StorageProvider, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Style.java b/org.adempiere.base/src/org/compiere/model/X_AD_Style.java
index 14a4156724..cb4e5691b9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Style.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Style.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Style
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Style")
 public class X_AD_Style extends PO implements I_AD_Style, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_StyleLine.java b/org.adempiere.base/src/org/compiere/model/X_AD_StyleLine.java
index a953054e91..3e32f1e1d1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_StyleLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_StyleLine.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_StyleLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_StyleLine")
 public class X_AD_StyleLine extends PO implements I_AD_StyleLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_SysConfig.java b/org.adempiere.base/src/org/compiere/model/X_AD_SysConfig.java
index 7e7bb650cf..686fc06bee 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_SysConfig.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_SysConfig.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_SysConfig
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_SysConfig")
 public class X_AD_SysConfig extends PO implements I_AD_SysConfig, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_System.java b/org.adempiere.base/src/org/compiere/model/X_AD_System.java
index 6cf8287576..5c89b5516a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_System.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_System.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_System
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_System")
 public class X_AD_System extends PO implements I_AD_System, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Tab.java b/org.adempiere.base/src/org/compiere/model/X_AD_Tab.java
index 05784bff61..24bdc2e0d0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Tab.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Tab.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Tab
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Tab")
 public class X_AD_Tab extends PO implements I_AD_Tab, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Tab_Customization.java b/org.adempiere.base/src/org/compiere/model/X_AD_Tab_Customization.java
index b4bb6520f1..12642f2f7c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Tab_Customization.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Tab_Customization.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Tab_Customization
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Tab_Customization")
 public class X_AD_Tab_Customization extends PO implements I_AD_Tab_Customization, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Table.java b/org.adempiere.base/src/org/compiere/model/X_AD_Table.java
index 4823fd7de8..c9b1de8e15 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Table.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Table.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Table
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Table")
 public class X_AD_Table extends PO implements I_AD_Table, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TableIndex.java b/org.adempiere.base/src/org/compiere/model/X_AD_TableIndex.java
index 6a663810ff..7e959edfc7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TableIndex.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TableIndex.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_TableIndex
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TableIndex")
 public class X_AD_TableIndex extends PO implements I_AD_TableIndex, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Table_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Table_Access.java
index a5d9ae0eec..6dc4714789 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Table_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Table_Access.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Table_Access
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Table_Access")
 public class X_AD_Table_Access extends PO implements I_AD_Table_Access, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Table_ScriptValidator.java b/org.adempiere.base/src/org/compiere/model/X_AD_Table_ScriptValidator.java
index 13ce62bad3..59afe689ee 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Table_ScriptValidator.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Table_ScriptValidator.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Table_ScriptValidator
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Table_ScriptValidator")
 public class X_AD_Table_ScriptValidator extends PO implements I_AD_Table_ScriptValidator, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Task.java b/org.adempiere.base/src/org/compiere/model/X_AD_Task.java
index f3a621ba55..b94286a2db 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Task.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Task.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Task
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Task")
 public class X_AD_Task extends PO implements I_AD_Task, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TaskInstance.java b/org.adempiere.base/src/org/compiere/model/X_AD_TaskInstance.java
index bc5858d2b8..f8aa1df52c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TaskInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TaskInstance.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_TaskInstance
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TaskInstance")
 public class X_AD_TaskInstance extends PO implements I_AD_TaskInstance, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Task_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Task_Access.java
index 2b681af732..70857fffb9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Task_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Task_Access.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Task_Access
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Task_Access")
 public class X_AD_Task_Access extends PO implements I_AD_Task_Access, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButton.java b/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButton.java
index 20b6c96a56..9d7d8652ad 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButton.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButton.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ToolBarButton
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ToolBarButton")
 public class X_AD_ToolBarButton extends PO implements I_AD_ToolBarButton, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButtonRestrict.java b/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButtonRestrict.java
index 8f1465c91d..c0c3650717 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButtonRestrict.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButtonRestrict.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_ToolBarButtonRestrict
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ToolBarButtonRestrict")
 public class X_AD_ToolBarButtonRestrict extends PO implements I_AD_ToolBarButtonRestrict, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Tree.java b/org.adempiere.base/src/org/compiere/model/X_AD_Tree.java
index ace46ca394..ad8b85bcdf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Tree.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Tree.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Tree
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Tree")
 public class X_AD_Tree extends PO implements I_AD_Tree, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNode.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNode.java
index dcad546c70..1772f25be6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNode.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNode.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_TreeNode
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TreeNode")
 public class X_AD_TreeNode extends PO implements I_AD_TreeNode, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeBP.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeBP.java
index 40c6aa7e1a..ac2f827f7e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeBP.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeBP.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_TreeNodeBP
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TreeNodeBP")
 public class X_AD_TreeNodeBP extends PO implements I_AD_TreeNodeBP, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMC.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMC.java
index 85c5a7644c..0e47a35fa3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMC.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMC.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_TreeNodeCMC
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TreeNodeCMC")
 public class X_AD_TreeNodeCMC extends PO implements I_AD_TreeNodeCMC, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMM.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMM.java
index 98bae6b764..697f978c28 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMM.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMM.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_TreeNodeCMM
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TreeNodeCMM")
 public class X_AD_TreeNodeCMM extends PO implements I_AD_TreeNodeCMM, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMS.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMS.java
index d8e0afe72c..2032f4e4ad 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMS.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMS.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_TreeNodeCMS
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TreeNodeCMS")
 public class X_AD_TreeNodeCMS extends PO implements I_AD_TreeNodeCMS, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMT.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMT.java
index ca5887968c..aa49b6af2d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMT.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeCMT.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_TreeNodeCMT
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TreeNodeCMT")
 public class X_AD_TreeNodeCMT extends PO implements I_AD_TreeNodeCMT, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeMM.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeMM.java
index 0652b61272..f21794c419 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeMM.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeMM.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_TreeNodeMM
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TreeNodeMM")
 public class X_AD_TreeNodeMM extends PO implements I_AD_TreeNodeMM, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodePR.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodePR.java
index a33e90ff05..dff4e2ae0d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodePR.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodePR.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_TreeNodePR
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TreeNodePR")
 public class X_AD_TreeNodePR extends PO implements I_AD_TreeNodePR, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU1.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU1.java
index 103c931410..c685d9be97 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU1.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU1.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_TreeNodeU1
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TreeNodeU1")
 public class X_AD_TreeNodeU1 extends PO implements I_AD_TreeNodeU1, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU2.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU2.java
index b826a67887..9f1d75c438 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU2.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU2.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_TreeNodeU2
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TreeNodeU2")
 public class X_AD_TreeNodeU2 extends PO implements I_AD_TreeNodeU2, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU3.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU3.java
index fdfc272e79..d3ae794b38 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU3.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU3.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_TreeNodeU3
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TreeNodeU3")
 public class X_AD_TreeNodeU3 extends PO implements I_AD_TreeNodeU3, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU4.java b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU4.java
index 95af41b49f..106e198c48 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU4.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_TreeNodeU4.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_TreeNodeU4
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_TreeNodeU4")
 public class X_AD_TreeNodeU4 extends PO implements I_AD_TreeNodeU4, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Tree_Favorite.java b/org.adempiere.base/src/org/compiere/model/X_AD_Tree_Favorite.java
index 1ca85ea4cd..7921f9dd04 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Tree_Favorite.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Tree_Favorite.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Tree_Favorite
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Tree_Favorite")
 public class X_AD_Tree_Favorite extends PO implements I_AD_Tree_Favorite, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Tree_Favorite_Node.java b/org.adempiere.base/src/org/compiere/model/X_AD_Tree_Favorite_Node.java
index 0fbfc39bdc..c45d0bae02 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Tree_Favorite_Node.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Tree_Favorite_Node.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Tree_Favorite_Node
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Tree_Favorite_Node")
 public class X_AD_Tree_Favorite_Node extends PO implements I_AD_Tree_Favorite_Node, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_User.java b/org.adempiere.base/src/org/compiere/model/X_AD_User.java
index 5947dcfe48..ccd064ced5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_User.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_User.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_User
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_User")
 public class X_AD_User extends PO implements I_AD_User, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserBPAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserBPAccess.java
index 5602de15a7..4ba12b8d5a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserBPAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserBPAccess.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_UserBPAccess
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_UserBPAccess")
 public class X_AD_UserBPAccess extends PO implements I_AD_UserBPAccess, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java
index b28a5ae5b9..f4827a25e7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserDef_Field
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_UserDef_Field")
 public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Info.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Info.java
index a765f8a704..1656ed4508 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Info.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Info.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_UserDef_Info
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_UserDef_Info")
 public class X_AD_UserDef_Info extends PO implements I_AD_UserDef_Info, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Info_Column.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Info_Column.java
index a4131362dd..9edacee7ef 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Info_Column.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Info_Column.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_UserDef_Info_Column
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_UserDef_Info_Column")
 public class X_AD_UserDef_Info_Column extends PO implements I_AD_UserDef_Info_Column, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Info_Related.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Info_Related.java
index 635cc5e83a..a0fa89d4c0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Info_Related.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Info_Related.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_UserDef_Info_Related
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_UserDef_Info_Related")
 public class X_AD_UserDef_Info_Related extends PO implements I_AD_UserDef_Info_Related, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc.java
index 7044bf9430..03110334fd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserDef_Proc
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_UserDef_Proc")
 public class X_AD_UserDef_Proc extends PO implements I_AD_UserDef_Proc, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc_Parameter.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc_Parameter.java
index 13f635382e..3f126d1aec 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc_Parameter.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc_Parameter.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserDef_Proc_Parameter
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_UserDef_Proc_Parameter")
 public class X_AD_UserDef_Proc_Parameter extends PO implements I_AD_UserDef_Proc_Parameter, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Tab.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Tab.java
index 43b62f2f3c..18059a5ae8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Tab.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Tab.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserDef_Tab
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_UserDef_Tab")
 public class X_AD_UserDef_Tab extends PO implements I_AD_UserDef_Tab, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Win.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Win.java
index 92131b0125..255b44aef5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Win.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Win.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserDef_Win
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_UserDef_Win")
 public class X_AD_UserDef_Win extends PO implements I_AD_UserDef_Win, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java
index 1f6fb34778..93f55cfe1e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserMail.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserMail
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_UserMail")
 public class X_AD_UserMail extends PO implements I_AD_UserMail, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserPreference.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserPreference.java
index 6b1a610db5..be2e4f0144 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserPreference.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserPreference.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_UserPreference
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_UserPreference")
 public class X_AD_UserPreference extends PO implements I_AD_UserPreference, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserQuery.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserQuery.java
index d0eb974853..a2420e2411 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_UserQuery.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserQuery.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_UserQuery
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_UserQuery")
 public class X_AD_UserQuery extends PO implements I_AD_UserQuery, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_User_OrgAccess.java b/org.adempiere.base/src/org/compiere/model/X_AD_User_OrgAccess.java
index f601894761..98cfce6348 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_User_OrgAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_User_OrgAccess.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_User_OrgAccess
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_User_OrgAccess")
 public class X_AD_User_OrgAccess extends PO implements I_AD_User_OrgAccess, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_User_Roles.java b/org.adempiere.base/src/org/compiere/model/X_AD_User_Roles.java
index be96faab19..a2f9e7b2ba 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_User_Roles.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_User_Roles.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_User_Roles
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_User_Roles")
 public class X_AD_User_Roles extends PO implements I_AD_User_Roles, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_User_Substitute.java b/org.adempiere.base/src/org/compiere/model/X_AD_User_Substitute.java
index 87ca494544..0636a4e728 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_User_Substitute.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_User_Substitute.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_User_Substitute
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_User_Substitute")
 public class X_AD_User_Substitute extends PO implements I_AD_User_Substitute, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Val_Rule.java b/org.adempiere.base/src/org/compiere/model/X_AD_Val_Rule.java
index 9d412ffbc8..febe05d4d5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Val_Rule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Val_Rule.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Val_Rule
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Val_Rule")
 public class X_AD_Val_Rule extends PO implements I_AD_Val_Rule, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ViewColumn.java b/org.adempiere.base/src/org/compiere/model/X_AD_ViewColumn.java
index f54c1f4823..395a96c487 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ViewColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ViewColumn.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_ViewColumn
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ViewColumn")
 public class X_AD_ViewColumn extends PO implements I_AD_ViewColumn, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ViewComponent.java b/org.adempiere.base/src/org/compiere/model/X_AD_ViewComponent.java
index 3e3a90a02e..2b362a011d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ViewComponent.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ViewComponent.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_ViewComponent
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ViewComponent")
 public class X_AD_ViewComponent extends PO implements I_AD_ViewComponent, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Activity.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Activity.java
index 0318c894fd..7731b203e9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Activity.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Activity.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Activity
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WF_Activity")
 public class X_AD_WF_Activity extends PO implements I_AD_WF_Activity, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityApprover.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityApprover.java
index 0ac50db7f4..9ac7bf72b5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityApprover.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityApprover.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_WF_ActivityApprover
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WF_ActivityApprover")
 public class X_AD_WF_ActivityApprover extends PO implements I_AD_WF_ActivityApprover, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityResult.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityResult.java
index 45b67733ec..4a9b3be263 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityResult.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ActivityResult.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_ActivityResult
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WF_ActivityResult")
 public class X_AD_WF_ActivityResult extends PO implements I_AD_WF_ActivityResult, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Block.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Block.java
index ede05d6da1..44a49310a1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Block.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Block.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Block
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WF_Block")
 public class X_AD_WF_Block extends PO implements I_AD_WF_Block, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_EventAudit.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_EventAudit.java
index 238aef6a48..be8ef4fd3d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_EventAudit.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_EventAudit.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_EventAudit
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WF_EventAudit")
 public class X_AD_WF_EventAudit extends PO implements I_AD_WF_EventAudit, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_NextCondition.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_NextCondition.java
index 3c25f83c86..2e7dc9f6cb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_NextCondition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_NextCondition.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_NextCondition
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WF_NextCondition")
 public class X_AD_WF_NextCondition extends PO implements I_AD_WF_NextCondition, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java
index 368582aa7e..def2e64258 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Node
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WF_Node")
 public class X_AD_WF_Node extends PO implements I_AD_WF_Node, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_NodeNext.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_NodeNext.java
index e209060e9c..44771fc48c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_NodeNext.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_NodeNext.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_NodeNext
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WF_NodeNext")
 public class X_AD_WF_NodeNext extends PO implements I_AD_WF_NodeNext, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node_Para.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node_Para.java
index d457cea936..1524e6ed6a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node_Para.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Node_Para
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WF_Node_Para")
 public class X_AD_WF_Node_Para extends PO implements I_AD_WF_Node_Para, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Process.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Process.java
index 237650a6b3..9d1e3c2c4f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Process.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Process.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Process
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WF_Process")
 public class X_AD_WF_Process extends PO implements I_AD_WF_Process, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_ProcessData.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ProcessData.java
index e1699ce8c0..f21436a81d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_ProcessData.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_ProcessData.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_ProcessData
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WF_ProcessData")
 public class X_AD_WF_ProcessData extends PO implements I_AD_WF_ProcessData, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Responsible.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Responsible.java
index cafa1981b4..76684bf20f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Responsible.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Responsible.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WF_Responsible
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WF_Responsible")
 public class X_AD_WF_Responsible extends PO implements I_AD_WF_Responsible, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Window.java b/org.adempiere.base/src/org/compiere/model/X_AD_Window.java
index 985ddd41c2..f7fec3045f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Window.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Window.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Window
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Window")
 public class X_AD_Window extends PO implements I_AD_Window, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Window_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Window_Access.java
index 42635ac7b4..b246c2e848 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Window_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Window_Access.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Window_Access
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Window_Access")
 public class X_AD_Window_Access extends PO implements I_AD_Window_Access, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WizardProcess.java b/org.adempiere.base/src/org/compiere/model/X_AD_WizardProcess.java
index 0d23956823..0647bd46aa 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WizardProcess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WizardProcess.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_WizardProcess
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WizardProcess")
 public class X_AD_WizardProcess extends PO implements I_AD_WizardProcess, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Workbench.java b/org.adempiere.base/src/org/compiere/model/X_AD_Workbench.java
index f0bbbb16ee..1ba49e1e62 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Workbench.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Workbench.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Workbench
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Workbench")
 public class X_AD_Workbench extends PO implements I_AD_Workbench, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WorkbenchWindow.java b/org.adempiere.base/src/org/compiere/model/X_AD_WorkbenchWindow.java
index 33ce7e77ce..8d0339778f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WorkbenchWindow.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WorkbenchWindow.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WorkbenchWindow
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WorkbenchWindow")
 public class X_AD_WorkbenchWindow extends PO implements I_AD_WorkbenchWindow, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Workflow.java b/org.adempiere.base/src/org/compiere/model/X_AD_Workflow.java
index eb0ce39597..6183f02b88 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Workflow.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Workflow.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_Workflow
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Workflow")
 public class X_AD_Workflow extends PO implements I_AD_Workflow, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessor.java b/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessor.java
index 6be61a3432..f30a5918c1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessor.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for AD_WorkflowProcessor
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WorkflowProcessor")
 public class X_AD_WorkflowProcessor extends PO implements I_AD_WorkflowProcessor, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java
index b2650105f2..ecf65aa7ae 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_WorkflowProcessorLog.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_WorkflowProcessorLog
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_WorkflowProcessorLog")
 public class X_AD_WorkflowProcessorLog extends PO implements I_AD_WorkflowProcessorLog, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Workflow_Access.java b/org.adempiere.base/src/org/compiere/model/X_AD_Workflow_Access.java
index 2387d560fa..dabf2c8ef2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_Workflow_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_Workflow_Access.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_Workflow_Access
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_Workflow_Access")
 public class X_AD_Workflow_Access extends PO implements I_AD_Workflow_Access, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ZoomCondition.java b/org.adempiere.base/src/org/compiere/model/X_AD_ZoomCondition.java
index 05e697eccf..ef46671a33 100644
--- a/org.adempiere.base/src/org/compiere/model/X_AD_ZoomCondition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_ZoomCondition.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for AD_ZoomCondition
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="AD_ZoomCondition")
 public class X_AD_ZoomCondition extends PO implements I_AD_ZoomCondition, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_ClientException.java b/org.adempiere.base/src/org/compiere/model/X_ASP_ClientException.java
index f0a532cc60..31d21b18ae 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_ClientException.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_ClientException.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for ASP_ClientException
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="ASP_ClientException")
 public class X_ASP_ClientException extends PO implements I_ASP_ClientException, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_ClientLevel.java b/org.adempiere.base/src/org/compiere/model/X_ASP_ClientLevel.java
index 7c7601b453..535ed59069 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_ClientLevel.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_ClientLevel.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for ASP_ClientLevel
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="ASP_ClientLevel")
 public class X_ASP_ClientLevel extends PO implements I_ASP_ClientLevel, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Field.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Field.java
index 8a597ba60e..504f246878 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Field.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Field.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for ASP_Field
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="ASP_Field")
 public class X_ASP_Field extends PO implements I_ASP_Field, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Form.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Form.java
index ac7518b6d7..be020d345f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Form.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Form.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for ASP_Form
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="ASP_Form")
 public class X_ASP_Form extends PO implements I_ASP_Form, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Level.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Level.java
index c3f3047806..ce25ef71a5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Level.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Level.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Level
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="ASP_Level")
 public class X_ASP_Level extends PO implements I_ASP_Level, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Module.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Module.java
index 93192d0dca..aafd890e41 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Module.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Module.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Module
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="ASP_Module")
 public class X_ASP_Module extends PO implements I_ASP_Module, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Process.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Process.java
index 37d6399348..9291cb199c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Process.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Process.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Process
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="ASP_Process")
 public class X_ASP_Process extends PO implements I_ASP_Process, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Process_Para.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Process_Para.java
index 4c05e798c6..2b3fa7ed2f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Process_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Process_Para.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for ASP_Process_Para
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="ASP_Process_Para")
 public class X_ASP_Process_Para extends PO implements I_ASP_Process_Para, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Ref_List.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Ref_List.java
index a6d436cd35..409a21c167 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Ref_List.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Ref_List.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for ASP_Ref_List
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="ASP_Ref_List")
 public class X_ASP_Ref_List extends PO implements I_ASP_Ref_List, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Tab.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Tab.java
index bfba1f0f58..26cdaa2712 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Tab.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Tab.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Tab
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="ASP_Tab")
 public class X_ASP_Tab extends PO implements I_ASP_Tab, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Task.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Task.java
index 436dc79c0d..e5f3b73bb8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Task.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Task.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for ASP_Task
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="ASP_Task")
 public class X_ASP_Task extends PO implements I_ASP_Task, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Window.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Window.java
index 17e6dec078..9f10fddacf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Window.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Window.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for ASP_Window
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="ASP_Window")
 public class X_ASP_Window extends PO implements I_ASP_Window, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_ASP_Workflow.java b/org.adempiere.base/src/org/compiere/model/X_ASP_Workflow.java
index b4c3fcdb2c..f84c9e36a2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_ASP_Workflow.java
+++ b/org.adempiere.base/src/org/compiere/model/X_ASP_Workflow.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for ASP_Workflow
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="ASP_Workflow")
 public class X_ASP_Workflow extends PO implements I_ASP_Workflow, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset.java
index 4bb32f0676..0a7f57b430 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for A_Asset
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset")
 public class X_A_Asset extends PO implements I_A_Asset, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Acct.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Acct.java
index 957b217df3..3234906b2c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Acct.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Acct")
 public class X_A_Asset_Acct extends PO implements I_A_Asset_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Addition.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Addition.java
index 198884c29c..d37585a9a0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Addition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Addition.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Addition
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Addition")
 public class X_A_Asset_Addition extends PO implements I_A_Asset_Addition, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Change.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Change.java
index 8afaa97548..ff393f89ca 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Change.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Change.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Change
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Change")
 public class X_A_Asset_Change extends PO implements I_A_Asset_Change, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Class.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Class.java
index caf2d04107..fe49534fee 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Class.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Class.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for A_Asset_Class
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Class")
 public class X_A_Asset_Class extends PO implements I_A_Asset_Class, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Delivery.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Delivery.java
index 8f151b4101..75019a1c41 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Delivery.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Delivery.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Delivery
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Delivery")
 public class X_A_Asset_Delivery extends PO implements I_A_Asset_Delivery, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Disposed.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Disposed.java
index d6a0478e76..a2e971c07c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Disposed.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Disposed.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Disposed
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Disposed")
 public class X_A_Asset_Disposed extends PO implements I_A_Asset_Disposed, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group.java
index 8d27821a9b..173d5358ba 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Group
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Group")
 public class X_A_Asset_Group extends PO implements I_A_Asset_Group, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group_Acct.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group_Acct.java
index 386461ce9a..91562c3a90 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Group_Acct.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Group_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Group_Acct")
 public class X_A_Asset_Group_Acct extends PO implements I_A_Asset_Group_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Fin.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Fin.java
index d8dd6cdb49..c402d68326 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Fin.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Fin.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Fin
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Info_Fin")
 public class X_A_Asset_Info_Fin extends PO implements I_A_Asset_Info_Fin, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Ins.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Ins.java
index 2d8bc4a1aa..acb77b44d9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Ins.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Ins.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Ins
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Info_Ins")
 public class X_A_Asset_Info_Ins extends PO implements I_A_Asset_Info_Ins, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Lic.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Lic.java
index 94995b13a5..eba69c8a3b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Lic.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Lic.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Lic
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Info_Lic")
 public class X_A_Asset_Info_Lic extends PO implements I_A_Asset_Info_Lic, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Oth.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Oth.java
index bb29241490..d838e5fc9e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Oth.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Oth.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Oth
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Info_Oth")
 public class X_A_Asset_Info_Oth extends PO implements I_A_Asset_Info_Oth, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Tax.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Tax.java
index fe95143f1e..dfd0774f5c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Tax.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Info_Tax.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Info_Tax
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Info_Tax")
 public class X_A_Asset_Info_Tax extends PO implements I_A_Asset_Info_Tax, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Product.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Product.java
index 07c1a27e2c..571abb2bac 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Product.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Product.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for A_Asset_Product
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Product")
 public class X_A_Asset_Product extends PO implements I_A_Asset_Product, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Retirement.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Retirement.java
index 1f0e1a32c3..8c40fab72f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Retirement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Retirement.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Retirement
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Retirement")
 public class X_A_Asset_Retirement extends PO implements I_A_Asset_Retirement, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval.java
index 7dff5d291e..7b70546deb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Reval
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Reval")
 public class X_A_Asset_Reval extends PO implements I_A_Asset_Reval, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Entry.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Entry.java
index 714ccb93aa..9825ba1d1d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Entry.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Entry.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Reval_Entry
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Reval_Entry")
 public class X_A_Asset_Reval_Entry extends PO implements I_A_Asset_Reval_Entry, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Index.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Index.java
index b1546dc9d3..a86a50b61f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Index.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Reval_Index.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Reval_Index
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Reval_Index")
 public class X_A_Asset_Reval_Index extends PO implements I_A_Asset_Reval_Index, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Split.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Split.java
index 4a500be5d5..eca0bda1a8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Split.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Split.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Split
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Split")
 public class X_A_Asset_Split extends PO implements I_A_Asset_Split, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Transfer.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Transfer.java
index e9a6160ed7..6160227e29 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Transfer.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Transfer.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Transfer
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Transfer")
 public class X_A_Asset_Transfer extends PO implements I_A_Asset_Transfer, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Type.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Type.java
index f599b1a789..06e69ec65b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Type.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Type.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Type
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Type")
 public class X_A_Asset_Type extends PO implements I_A_Asset_Type, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Use.java b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Use.java
index a8d549db3c..60ee424dac 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Asset_Use.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Asset_Use.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Asset_Use
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Asset_Use")
 public class X_A_Asset_Use extends PO implements I_A_Asset_Use, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation.java
index 47eb7bbd05..d646b14d2f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for A_Depreciation
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Depreciation")
 public class X_A_Depreciation extends PO implements I_A_Depreciation, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Build.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Build.java
index 58d12c952d..cfd1845514 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Build.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Build.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Build
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Depreciation_Build")
 public class X_A_Depreciation_Build extends PO implements I_A_Depreciation_Build, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Convention.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Convention.java
index 9177dcf5ab..1560655fb3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Convention.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Convention.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for A_Depreciation_Convention
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Depreciation_Convention")
 public class X_A_Depreciation_Convention extends PO implements I_A_Depreciation_Convention, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Entry.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Entry.java
index a902dfe8c6..d59ade08c8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Entry.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Entry.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Entry
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Depreciation_Entry")
 public class X_A_Depreciation_Entry extends PO implements I_A_Depreciation_Entry, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Exp.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Exp.java
index d8287f1691..5ad533c477 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Exp.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Exp.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Exp
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Depreciation_Exp")
 public class X_A_Depreciation_Exp extends PO implements I_A_Depreciation_Exp, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Forecast.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Forecast.java
index b5fce7b420..8da987b939 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Forecast.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Forecast.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Forecast
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Depreciation_Forecast")
 public class X_A_Depreciation_Forecast extends PO implements I_A_Depreciation_Forecast, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Method.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Method.java
index 3b2c25cf44..63368a052b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Method.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Method.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Method
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Depreciation_Method")
 public class X_A_Depreciation_Method extends PO implements I_A_Depreciation_Method, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java
index 70f45c1ebd..909874dcb0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Detail.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Table_Detail
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Depreciation_Table_Detail")
 public class X_A_Depreciation_Table_Detail extends PO implements I_A_Depreciation_Table_Detail, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Header.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Header.java
index 76909e916f..402aee5323 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Header.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Table_Header.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Table_Header
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Depreciation_Table_Header")
 public class X_A_Depreciation_Table_Header extends PO implements I_A_Depreciation_Table_Header, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Workfile.java b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Workfile.java
index 962f413349..1d6cfa72bf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Workfile.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Depreciation_Workfile.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Depreciation_Workfile
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Depreciation_Workfile")
 public class X_A_Depreciation_Workfile extends PO implements I_A_Depreciation_Workfile, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_FundingMode.java b/org.adempiere.base/src/org/compiere/model/X_A_FundingMode.java
index a9231ff6f6..641fdc5015 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_FundingMode.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_FundingMode.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_FundingMode
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_FundingMode")
 public class X_A_FundingMode extends PO implements I_A_FundingMode, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_FundingMode_Acct.java b/org.adempiere.base/src/org/compiere/model/X_A_FundingMode_Acct.java
index cd341bc34c..ab7794bbb5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_FundingMode_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_FundingMode_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for A_FundingMode_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_FundingMode_Acct")
 public class X_A_FundingMode_Acct extends PO implements I_A_FundingMode_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_Registration.java b/org.adempiere.base/src/org/compiere/model/X_A_Registration.java
index 42681b6ec6..ebe1abe24e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_Registration.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_Registration.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_Registration
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_Registration")
 public class X_A_Registration extends PO implements I_A_Registration, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_RegistrationAttribute.java b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationAttribute.java
index f9cad30221..910e585fec 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_RegistrationAttribute.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationAttribute.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_RegistrationAttribute
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_RegistrationAttribute")
 public class X_A_RegistrationAttribute extends PO implements I_A_RegistrationAttribute, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_RegistrationProduct.java b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationProduct.java
index cf5b4fc65b..303f094eea 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_RegistrationProduct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationProduct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for A_RegistrationProduct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_RegistrationProduct")
 public class X_A_RegistrationProduct extends PO implements I_A_RegistrationProduct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_A_RegistrationValue.java b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationValue.java
index d77fbbc9eb..3b071500b2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_A_RegistrationValue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_A_RegistrationValue.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for A_RegistrationValue
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="A_RegistrationValue")
 public class X_A_RegistrationValue extends PO implements I_A_RegistrationValue, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_Bid.java b/org.adempiere.base/src/org/compiere/model/X_B_Bid.java
index d794949e39..b74a350a6c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_Bid.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_Bid.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Bid
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="B_Bid")
 public class X_B_Bid extends PO implements I_B_Bid, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_BidComment.java b/org.adempiere.base/src/org/compiere/model/X_B_BidComment.java
index 5f54bc8b0f..48276dbd27 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_BidComment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_BidComment.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for B_BidComment
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="B_BidComment")
 public class X_B_BidComment extends PO implements I_B_BidComment, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_Buyer.java b/org.adempiere.base/src/org/compiere/model/X_B_Buyer.java
index f74c1b0c0a..f9e5ad2585 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_Buyer.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_Buyer.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Buyer
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="B_Buyer")
 public class X_B_Buyer extends PO implements I_B_Buyer, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_BuyerFunds.java b/org.adempiere.base/src/org/compiere/model/X_B_BuyerFunds.java
index 4613d15bef..458968268e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_BuyerFunds.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_BuyerFunds.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_BuyerFunds
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="B_BuyerFunds")
 public class X_B_BuyerFunds extends PO implements I_B_BuyerFunds, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_Offer.java b/org.adempiere.base/src/org/compiere/model/X_B_Offer.java
index 35aa5b9b14..bea10d4c8b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_Offer.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_Offer.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Offer
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="B_Offer")
 public class X_B_Offer extends PO implements I_B_Offer, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_Seller.java b/org.adempiere.base/src/org/compiere/model/X_B_Seller.java
index 6330605dad..96d292ad64 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_Seller.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_Seller.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Seller
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="B_Seller")
 public class X_B_Seller extends PO implements I_B_Seller, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_SellerFunds.java b/org.adempiere.base/src/org/compiere/model/X_B_SellerFunds.java
index e73ed4d6be..38da00eb82 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_SellerFunds.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_SellerFunds.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_SellerFunds
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="B_SellerFunds")
 public class X_B_SellerFunds extends PO implements I_B_SellerFunds, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_Topic.java b/org.adempiere.base/src/org/compiere/model/X_B_Topic.java
index 574f320076..f5cc991113 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_Topic.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_Topic.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_Topic
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="B_Topic")
 public class X_B_Topic extends PO implements I_B_Topic, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_TopicCategory.java b/org.adempiere.base/src/org/compiere/model/X_B_TopicCategory.java
index f83d9b59e9..eb23b418cf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_TopicCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_TopicCategory.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_TopicCategory
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="B_TopicCategory")
 public class X_B_TopicCategory extends PO implements I_B_TopicCategory, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_B_TopicType.java b/org.adempiere.base/src/org/compiere/model/X_B_TopicType.java
index e77751da12..9935659ba1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_B_TopicType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_B_TopicType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for B_TopicType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="B_TopicType")
 public class X_B_TopicType extends PO implements I_B_TopicType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_Chat.java b/org.adempiere.base/src/org/compiere/model/X_CM_Chat.java
index 1fc4391d9d..3266beed7c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_Chat.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_Chat.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_Chat
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="CM_Chat")
 public class X_CM_Chat extends PO implements I_CM_Chat, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_ChatEntry.java b/org.adempiere.base/src/org/compiere/model/X_CM_ChatEntry.java
index 041a41457b..edc5b8a1f9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_ChatEntry.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_ChatEntry.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_ChatEntry
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="CM_ChatEntry")
 public class X_CM_ChatEntry extends PO implements I_CM_ChatEntry, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_ChatType.java b/org.adempiere.base/src/org/compiere/model/X_CM_ChatType.java
index 439cfda40d..d5714bd4cb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_ChatType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_ChatType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for CM_ChatType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="CM_ChatType")
 public class X_CM_ChatType extends PO implements I_CM_ChatType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_ChatTypeUpdate.java b/org.adempiere.base/src/org/compiere/model/X_CM_ChatTypeUpdate.java
index b7e2d81858..a57b8a5b46 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_ChatTypeUpdate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_ChatTypeUpdate.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for CM_ChatTypeUpdate
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="CM_ChatTypeUpdate")
 public class X_CM_ChatTypeUpdate extends PO implements I_CM_ChatTypeUpdate, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_CM_ChatUpdate.java b/org.adempiere.base/src/org/compiere/model/X_CM_ChatUpdate.java
index 5139313a5a..7edba26094 100644
--- a/org.adempiere.base/src/org/compiere/model/X_CM_ChatUpdate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_CM_ChatUpdate.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for CM_ChatUpdate
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="CM_ChatUpdate")
 public class X_CM_ChatUpdate extends PO implements I_CM_ChatUpdate, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_1099Box.java b/org.adempiere.base/src/org/compiere/model/X_C_1099Box.java
index 906cc8bb97..7014980c3b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_1099Box.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_1099Box.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_1099Box
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_1099Box")
 public class X_C_1099Box extends PO implements I_C_1099Box, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessor.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessor.java
index 9e59caf9ee..ecd7d19ed3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessor.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctProcessor
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_AcctProcessor")
 public class X_C_AcctProcessor extends PO implements I_C_AcctProcessor, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessorLog.java
index fa436aa60d..ddc549da07 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctProcessorLog.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_AcctProcessorLog
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_AcctProcessorLog")
 public class X_C_AcctProcessorLog extends PO implements I_C_AcctProcessorLog, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema.java
index ae9b83903b..d9b08e4b58 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctSchema
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_AcctSchema")
 public class X_C_AcctSchema extends PO implements I_C_AcctSchema, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java
index 7fd4c49df6..5df02e91b3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Default.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctSchema_Default
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_AcctSchema_Default")
 public class X_C_AcctSchema_Default extends PO implements I_C_AcctSchema_Default, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Element.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Element.java
index 6f30962df4..89c7df4ce3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Element.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_Element.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctSchema_Element
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_AcctSchema_Element")
 public class X_C_AcctSchema_Element extends PO implements I_C_AcctSchema_Element, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java
index 7d372b41ba..b58d582218 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AcctSchema_GL.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AcctSchema_GL
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_AcctSchema_GL")
 public class X_C_AcctSchema_GL extends PO implements I_C_AcctSchema_GL, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Activity.java b/org.adempiere.base/src/org/compiere/model/X_C_Activity.java
index 1c51455dc4..0b993f8ff7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Activity.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Activity.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Activity
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Activity")
 public class X_C_Activity extends PO implements I_C_Activity, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AddressTransaction.java b/org.adempiere.base/src/org/compiere/model/X_C_AddressTransaction.java
index 4bf6427082..46b52bd020 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AddressTransaction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AddressTransaction.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AddressTransaction
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_AddressTransaction")
 public class X_C_AddressTransaction extends PO implements I_C_AddressTransaction, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AddressValidation.java b/org.adempiere.base/src/org/compiere/model/X_C_AddressValidation.java
index 47fe35037a..ad56c83124 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AddressValidation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AddressValidation.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_AddressValidation
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_AddressValidation")
 public class X_C_AddressValidation extends PO implements I_C_AddressValidation, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AddressValidationCfg.java b/org.adempiere.base/src/org/compiere/model/X_C_AddressValidationCfg.java
index de07bff8d4..1cdfcc2c17 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AddressValidationCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AddressValidationCfg.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AddressValidationCfg
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_AddressValidationCfg")
 public class X_C_AddressValidationCfg extends PO implements I_C_AddressValidationCfg, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AllocationHdr.java b/org.adempiere.base/src/org/compiere/model/X_C_AllocationHdr.java
index 8887cf85e0..4704023fc5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AllocationHdr.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AllocationHdr.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AllocationHdr
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_AllocationHdr")
 public class X_C_AllocationHdr extends PO implements I_C_AllocationHdr, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_AllocationLine.java b/org.adempiere.base/src/org/compiere/model/X_C_AllocationLine.java
index 42992e9689..3b49ca23bb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_AllocationLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_AllocationLine.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_AllocationLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_AllocationLine")
 public class X_C_AllocationLine extends PO implements I_C_AllocationLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_BankAccount.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_BankAccount.java
index 29754d9adc..5b402abc1a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_BankAccount.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_BankAccount.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_BankAccount
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BP_BankAccount")
 public class X_C_BP_BankAccount extends PO implements I_C_BP_BankAccount, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Customer_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Customer_Acct.java
index 8962be56a6..28e593edc3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Customer_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Customer_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_BP_Customer_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BP_Customer_Acct")
 public class X_C_BP_Customer_Acct extends PO implements I_C_BP_Customer_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_EDI.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_EDI.java
index dbbe798768..1cb40479c8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_EDI.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_EDI.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_EDI
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BP_EDI")
 public class X_C_BP_EDI extends PO implements I_C_BP_EDI, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java
index 373a7e7d5e..fd45cde40d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Employee_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_BP_Employee_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BP_Employee_Acct")
 public class X_C_BP_Employee_Acct extends PO implements I_C_BP_Employee_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Group.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Group.java
index 9dd2550dc8..103850a599 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Group.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Group.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_Group
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BP_Group")
 public class X_C_BP_Group extends PO implements I_C_BP_Group, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java
index 75831da462..df3de286cb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Group_Acct.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_Group_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BP_Group_Acct")
 public class X_C_BP_Group_Acct extends PO implements I_C_BP_Group_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Relation.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Relation.java
index fbc5110539..455aa96285 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Relation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Relation.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_Relation
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BP_Relation")
 public class X_C_BP_Relation extends PO implements I_C_BP_Relation, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_ShippingAcct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_ShippingAcct.java
index 0b3dc053ee..e2c4018b8f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_ShippingAcct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_ShippingAcct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_BP_ShippingAcct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BP_ShippingAcct")
 public class X_C_BP_ShippingAcct extends PO implements I_C_BP_ShippingAcct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Vendor_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Vendor_Acct.java
index da80c30faf..80c277db64 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Vendor_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Vendor_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_BP_Vendor_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BP_Vendor_Acct")
 public class X_C_BP_Vendor_Acct extends PO implements I_C_BP_Vendor_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BP_Withholding.java b/org.adempiere.base/src/org/compiere/model/X_C_BP_Withholding.java
index 48c9d8d36b..08fcd210ad 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BP_Withholding.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BP_Withholding.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BP_Withholding
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BP_Withholding")
 public class X_C_BP_Withholding extends PO implements I_C_BP_Withholding, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BPartner.java b/org.adempiere.base/src/org/compiere/model/X_C_BPartner.java
index f898a92083..7b55c06ef8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BPartner.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BPartner.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BPartner
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BPartner")
 public class X_C_BPartner extends PO implements I_C_BPartner, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Location.java b/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Location.java
index c3267fbef2..e3c5b13c74 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Location.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Location.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BPartner_Location
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BPartner_Location")
 public class X_C_BPartner_Location extends PO implements I_C_BPartner_Location, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Product.java b/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Product.java
index 5c82b2bccd..5aa2cd86b9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Product.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BPartner_Product.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for C_BPartner_Product
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BPartner_Product")
 public class X_C_BPartner_Product extends PO implements I_C_BPartner_Product, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Bank.java b/org.adempiere.base/src/org/compiere/model/X_C_Bank.java
index ffc3853a9d..6097bb1c92 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Bank.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Bank.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Bank
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Bank")
 public class X_C_Bank extends PO implements I_C_Bank, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount.java b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount.java
index fd6a418352..a9ce8a3f80 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankAccount
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BankAccount")
 public class X_C_BankAccount extends PO implements I_C_BankAccount, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankAccountDoc.java b/org.adempiere.base/src/org/compiere/model/X_C_BankAccountDoc.java
index 516b91a716..9dbeb38004 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankAccountDoc.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankAccountDoc.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankAccountDoc
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BankAccountDoc")
 public class X_C_BankAccountDoc extends PO implements I_C_BankAccountDoc, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java
index 94fc507d47..83b6968c1a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_BankAccount_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BankAccount_Acct")
 public class X_C_BankAccount_Acct extends PO implements I_C_BankAccount_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Processor.java b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Processor.java
index b7a1708cd7..8cc099fb1d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Processor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankAccount_Processor.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for C_BankAccount_Processor
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BankAccount_Processor")
 public class X_C_BankAccount_Processor extends PO implements I_C_BankAccount_Processor, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankStatement.java b/org.adempiere.base/src/org/compiere/model/X_C_BankStatement.java
index 363f17cb48..eb9503df25 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankStatement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankStatement.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankStatement
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BankStatement")
 public class X_C_BankStatement extends PO implements I_C_BankStatement, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLine.java b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLine.java
index 3f728ed8a0..57b30084a8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLine.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankStatementLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BankStatementLine")
 public class X_C_BankStatementLine extends PO implements I_C_BankStatementLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLoader.java b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLoader.java
index 7a4af3df7c..5f51bf308c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLoader.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementLoader.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankStatementLoader
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BankStatementLoader")
 public class X_C_BankStatementLoader extends PO implements I_C_BankStatementLoader, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_BankStatementMatcher.java b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementMatcher.java
index f52cc7a53a..4a1f53bbf4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_BankStatementMatcher.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_BankStatementMatcher.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_BankStatementMatcher
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_BankStatementMatcher")
 public class X_C_BankStatementMatcher extends PO implements I_C_BankStatementMatcher, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Calendar.java b/org.adempiere.base/src/org/compiere/model/X_C_Calendar.java
index e55cf80fa9..a7c93e2967 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Calendar.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Calendar.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Calendar
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Calendar")
 public class X_C_Calendar extends PO implements I_C_Calendar, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Campaign.java b/org.adempiere.base/src/org/compiere/model/X_C_Campaign.java
index a498306f1b..658097dccb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Campaign.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Campaign.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Campaign
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Campaign")
 public class X_C_Campaign extends PO implements I_C_Campaign, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Cash.java b/org.adempiere.base/src/org/compiere/model/X_C_Cash.java
index 1b50d72880..0ea312c083 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Cash.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Cash.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Cash
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Cash")
 public class X_C_Cash extends PO implements I_C_Cash, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CashBook.java b/org.adempiere.base/src/org/compiere/model/X_C_CashBook.java
index 86a5f38778..5a9bd80210 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CashBook.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CashBook.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CashBook
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_CashBook")
 public class X_C_CashBook extends PO implements I_C_CashBook, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CashBook_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_CashBook_Acct.java
index 8576d6dcde..76ac9224d4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CashBook_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CashBook_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_CashBook_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_CashBook_Acct")
 public class X_C_CashBook_Acct extends PO implements I_C_CashBook_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CashLine.java b/org.adempiere.base/src/org/compiere/model/X_C_CashLine.java
index 071c8bc81f..e929bc84e4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CashLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CashLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CashLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_CashLine")
 public class X_C_CashLine extends PO implements I_C_CashLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CashPlan.java b/org.adempiere.base/src/org/compiere/model/X_C_CashPlan.java
index c1076e8d6f..7b8ae3bb8b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CashPlan.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CashPlan.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CashPlan
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_CashPlan")
 public class X_C_CashPlan extends PO implements I_C_CashPlan, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CashPlanLine.java b/org.adempiere.base/src/org/compiere/model/X_C_CashPlanLine.java
index 5789ad76f5..f3282bbe27 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CashPlanLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CashPlanLine.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CashPlanLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_CashPlanLine")
 public class X_C_CashPlanLine extends PO implements I_C_CashPlanLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Channel.java b/org.adempiere.base/src/org/compiere/model/X_C_Channel.java
index 68733e7442..5613ec34f2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Channel.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Channel.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Channel
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Channel")
 public class X_C_Channel extends PO implements I_C_Channel, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Charge.java b/org.adempiere.base/src/org/compiere/model/X_C_Charge.java
index 76723d7840..7911b39f9d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Charge.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Charge.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Charge
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Charge")
 public class X_C_Charge extends PO implements I_C_Charge, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ChargeType.java b/org.adempiere.base/src/org/compiere/model/X_C_ChargeType.java
index afaa2fdcbd..b1073eb708 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ChargeType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ChargeType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ChargeType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ChargeType")
 public class X_C_ChargeType extends PO implements I_C_ChargeType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ChargeType_DocType.java b/org.adempiere.base/src/org/compiere/model/X_C_ChargeType_DocType.java
index 0470ceb3ba..59dd6f2e1f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ChargeType_DocType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ChargeType_DocType.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_ChargeType_DocType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ChargeType_DocType")
 public class X_C_ChargeType_DocType extends PO implements I_C_ChargeType_DocType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Charge_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Charge_Acct.java
index 60d463c226..a9fa94d535 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Charge_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Charge_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_Charge_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Charge_Acct")
 public class X_C_Charge_Acct extends PO implements I_C_Charge_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_City.java b/org.adempiere.base/src/org/compiere/model/X_C_City.java
index 9d4a0a0eec..35dc306781 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_City.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_City.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_City
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_City")
 public class X_C_City extends PO implements I_C_City, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Commission.java b/org.adempiere.base/src/org/compiere/model/X_C_Commission.java
index 81f60385cc..0e1560db1d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Commission.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Commission.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Commission
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Commission")
 public class X_C_Commission extends PO implements I_C_Commission, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CommissionAmt.java b/org.adempiere.base/src/org/compiere/model/X_C_CommissionAmt.java
index c8069f0b3e..724a8d5d5d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CommissionAmt.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CommissionAmt.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CommissionAmt
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_CommissionAmt")
 public class X_C_CommissionAmt extends PO implements I_C_CommissionAmt, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CommissionDetail.java b/org.adempiere.base/src/org/compiere/model/X_C_CommissionDetail.java
index ea2d93a943..136f993804 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CommissionDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CommissionDetail.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CommissionDetail
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_CommissionDetail")
 public class X_C_CommissionDetail extends PO implements I_C_CommissionDetail, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CommissionLine.java b/org.adempiere.base/src/org/compiere/model/X_C_CommissionLine.java
index 5e10b96b5d..46d1833735 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CommissionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CommissionLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CommissionLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_CommissionLine")
 public class X_C_CommissionLine extends PO implements I_C_CommissionLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CommissionRun.java b/org.adempiere.base/src/org/compiere/model/X_C_CommissionRun.java
index 0e419870ac..dfdecdded3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CommissionRun.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CommissionRun.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CommissionRun
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_CommissionRun")
 public class X_C_CommissionRun extends PO implements I_C_CommissionRun, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ContactActivity.java b/org.adempiere.base/src/org/compiere/model/X_C_ContactActivity.java
index 9eed157a7a..b567e6a3cb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ContactActivity.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ContactActivity.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ContactActivity
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ContactActivity")
 public class X_C_ContactActivity extends PO implements I_C_ContactActivity, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ConversionType.java b/org.adempiere.base/src/org/compiere/model/X_C_ConversionType.java
index fe4e9f318d..010c333a7c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ConversionType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ConversionType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ConversionType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ConversionType")
 public class X_C_ConversionType extends PO implements I_C_ConversionType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Conversion_Rate.java b/org.adempiere.base/src/org/compiere/model/X_C_Conversion_Rate.java
index 16d039020f..de2c228f96 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Conversion_Rate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Conversion_Rate.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Conversion_Rate
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Conversion_Rate")
 public class X_C_Conversion_Rate extends PO implements I_C_Conversion_Rate, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Country.java b/org.adempiere.base/src/org/compiere/model/X_C_Country.java
index 13a4d56d30..bc14bc80e5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Country.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Country.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Country
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Country")
 public class X_C_Country extends PO implements I_C_Country, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CountryGroup.java b/org.adempiere.base/src/org/compiere/model/X_C_CountryGroup.java
index f0f0500c39..da188a8477 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CountryGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CountryGroup.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CountryGroup
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_CountryGroup")
 public class X_C_CountryGroup extends PO implements I_C_CountryGroup, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CountryGroupCountry.java b/org.adempiere.base/src/org/compiere/model/X_C_CountryGroupCountry.java
index 567849a7dc..63068b1e58 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CountryGroupCountry.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CountryGroupCountry.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_CountryGroupCountry
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_CountryGroupCountry")
 public class X_C_CountryGroupCountry extends PO implements I_C_CountryGroupCountry, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Currency.java b/org.adempiere.base/src/org/compiere/model/X_C_Currency.java
index 792e28665c..c3eeeb72fc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Currency.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Currency.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Currency
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Currency")
 public class X_C_Currency extends PO implements I_C_Currency, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java
index c2037cc09f..2c0539f9bc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Currency_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_Currency_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Currency_Acct")
 public class X_C_Currency_Acct extends PO implements I_C_Currency_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Cycle.java b/org.adempiere.base/src/org/compiere/model/X_C_Cycle.java
index a84ffb3107..08f2639967 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Cycle.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Cycle.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Cycle
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Cycle")
 public class X_C_Cycle extends PO implements I_C_Cycle, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CyclePhase.java b/org.adempiere.base/src/org/compiere/model/X_C_CyclePhase.java
index 1d0c46232e..d59cd69579 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CyclePhase.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CyclePhase.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_CyclePhase
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_CyclePhase")
 public class X_C_CyclePhase extends PO implements I_C_CyclePhase, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_CycleStep.java b/org.adempiere.base/src/org/compiere/model/X_C_CycleStep.java
index 4426814ee0..3b75adc0a3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_CycleStep.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_CycleStep.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_CycleStep
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_CycleStep")
 public class X_C_CycleStep extends PO implements I_C_CycleStep, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DepositBatch.java b/org.adempiere.base/src/org/compiere/model/X_C_DepositBatch.java
index 666052207f..0d8b218e54 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DepositBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DepositBatch.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DepositBatch
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_DepositBatch")
 public class X_C_DepositBatch extends PO implements I_C_DepositBatch, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DepositBatchLine.java b/org.adempiere.base/src/org/compiere/model/X_C_DepositBatchLine.java
index 304bf1f482..a284babffe 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DepositBatchLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DepositBatchLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DepositBatchLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_DepositBatchLine")
 public class X_C_DepositBatchLine extends PO implements I_C_DepositBatchLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DocType.java b/org.adempiere.base/src/org/compiere/model/X_C_DocType.java
index f9fa525ead..63e38fcc40 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DocType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DocType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DocType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_DocType")
 public class X_C_DocType extends PO implements I_C_DocType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DocTypeCounter.java b/org.adempiere.base/src/org/compiere/model/X_C_DocTypeCounter.java
index 26f455576d..e9f0979437 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DocTypeCounter.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DocTypeCounter.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DocTypeCounter
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_DocTypeCounter")
 public class X_C_DocTypeCounter extends PO implements I_C_DocTypeCounter, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Dunning.java b/org.adempiere.base/src/org/compiere/model/X_C_Dunning.java
index a48019e261..5d328a6ac7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Dunning.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Dunning.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Dunning
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Dunning")
 public class X_C_Dunning extends PO implements I_C_Dunning, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DunningLevel.java b/org.adempiere.base/src/org/compiere/model/X_C_DunningLevel.java
index 5937da8e7a..590ab4da70 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DunningLevel.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DunningLevel.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DunningLevel
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_DunningLevel")
 public class X_C_DunningLevel extends PO implements I_C_DunningLevel, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DunningRun.java b/org.adempiere.base/src/org/compiere/model/X_C_DunningRun.java
index 742fbd2bfa..5f89752058 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DunningRun.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DunningRun.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DunningRun
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_DunningRun")
 public class X_C_DunningRun extends PO implements I_C_DunningRun, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DunningRunEntry.java b/org.adempiere.base/src/org/compiere/model/X_C_DunningRunEntry.java
index 665acd5b99..b3b1d2931d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DunningRunEntry.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DunningRunEntry.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DunningRunEntry
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_DunningRunEntry")
 public class X_C_DunningRunEntry extends PO implements I_C_DunningRunEntry, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_DunningRunLine.java b/org.adempiere.base/src/org/compiere/model/X_C_DunningRunLine.java
index c427c638d0..da1fac4087 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_DunningRunLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_DunningRunLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_DunningRunLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_DunningRunLine")
 public class X_C_DunningRunLine extends PO implements I_C_DunningRunLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Element.java b/org.adempiere.base/src/org/compiere/model/X_C_Element.java
index 66684a16f9..52e53333a2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Element.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Element.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Element
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Element")
 public class X_C_Element extends PO implements I_C_Element, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java b/org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java
index be1c7fcc38..b1acdf6bba 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ElementValue.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ElementValue
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ElementValue")
 public class X_C_ElementValue extends PO implements I_C_ElementValue, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Greeting.java b/org.adempiere.base/src/org/compiere/model/X_C_Greeting.java
index 117e52b171..5022666880 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Greeting.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Greeting.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Greeting
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Greeting")
 public class X_C_Greeting extends PO implements I_C_Greeting, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InterOrg_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_InterOrg_Acct.java
index 456c6395e5..8c410ae350 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InterOrg_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InterOrg_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_InterOrg_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_InterOrg_Acct")
 public class X_C_InterOrg_Acct extends PO implements I_C_InterOrg_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Invoice.java b/org.adempiere.base/src/org/compiere/model/X_C_Invoice.java
index 4713994ba4..fc686d2e72 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Invoice.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Invoice.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Invoice
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Invoice")
 public class X_C_Invoice extends PO implements I_C_Invoice, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatch.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatch.java
index 325ad94acc..74a4a41c8c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatch.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoiceBatch
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_InvoiceBatch")
 public class X_C_InvoiceBatch extends PO implements I_C_InvoiceBatch, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatchLine.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatchLine.java
index 5e15fd1b9a..40237f173f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatchLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceBatchLine.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoiceBatchLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_InvoiceBatchLine")
 public class X_C_InvoiceBatchLine extends PO implements I_C_InvoiceBatchLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceLine.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceLine.java
index ad1c53c704..75c024a91c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceLine.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoiceLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_InvoiceLine")
 public class X_C_InvoiceLine extends PO implements I_C_InvoiceLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InvoicePaySchedule.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoicePaySchedule.java
index c3168afd71..7f211dd8a1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InvoicePaySchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InvoicePaySchedule.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoicePaySchedule
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_InvoicePaySchedule")
 public class X_C_InvoicePaySchedule extends PO implements I_C_InvoicePaySchedule, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceSchedule.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceSchedule.java
index 82d19db524..a95c74737e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceSchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceSchedule.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_InvoiceSchedule
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_InvoiceSchedule")
 public class X_C_InvoiceSchedule extends PO implements I_C_InvoiceSchedule, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceTax.java b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceTax.java
index c838d95418..85b21f3ab3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_InvoiceTax.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_InvoiceTax.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for C_InvoiceTax
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_InvoiceTax")
 public class X_C_InvoiceTax extends PO implements I_C_InvoiceTax, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Job.java b/org.adempiere.base/src/org/compiere/model/X_C_Job.java
index d258cad8c1..a62b3f3cea 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Job.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Job.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Job
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Job")
 public class X_C_Job extends PO implements I_C_Job, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_JobAssignment.java b/org.adempiere.base/src/org/compiere/model/X_C_JobAssignment.java
index f586f8934e..23a9a46b92 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_JobAssignment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_JobAssignment.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_JobAssignment
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_JobAssignment")
 public class X_C_JobAssignment extends PO implements I_C_JobAssignment, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_JobCategory.java b/org.adempiere.base/src/org/compiere/model/X_C_JobCategory.java
index 9e40c0c2af..fef7b9836d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_JobCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_JobCategory.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_JobCategory
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_JobCategory")
 public class X_C_JobCategory extends PO implements I_C_JobCategory, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_JobRemuneration.java b/org.adempiere.base/src/org/compiere/model/X_C_JobRemuneration.java
index 388447d8c9..e3d3d8477d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_JobRemuneration.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_JobRemuneration.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_JobRemuneration
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_JobRemuneration")
 public class X_C_JobRemuneration extends PO implements I_C_JobRemuneration, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_LandedCost.java b/org.adempiere.base/src/org/compiere/model/X_C_LandedCost.java
index 563628e279..2be18ec151 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_LandedCost.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_LandedCost.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_LandedCost
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_LandedCost")
 public class X_C_LandedCost extends PO implements I_C_LandedCost, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_LandedCostAllocation.java b/org.adempiere.base/src/org/compiere/model/X_C_LandedCostAllocation.java
index bf98a3e8fa..189be35c5d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_LandedCostAllocation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_LandedCostAllocation.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_LandedCostAllocation
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_LandedCostAllocation")
 public class X_C_LandedCostAllocation extends PO implements I_C_LandedCostAllocation, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Location.java b/org.adempiere.base/src/org/compiere/model/X_C_Location.java
index 0112c07d2c..cc4d72e743 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Location.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Location.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Location
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Location")
 public class X_C_Location extends PO implements I_C_Location, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_NonBusinessDay.java b/org.adempiere.base/src/org/compiere/model/X_C_NonBusinessDay.java
index c3e9597050..e288ef9847 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_NonBusinessDay.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_NonBusinessDay.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_NonBusinessDay
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_NonBusinessDay")
 public class X_C_NonBusinessDay extends PO implements I_C_NonBusinessDay, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OnlineTrxHistory.java b/org.adempiere.base/src/org/compiere/model/X_C_OnlineTrxHistory.java
index ee687e0010..1da28ea138 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OnlineTrxHistory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OnlineTrxHistory.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_OnlineTrxHistory
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_OnlineTrxHistory")
 public class X_C_OnlineTrxHistory extends PO implements I_C_OnlineTrxHistory, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Opportunity.java b/org.adempiere.base/src/org/compiere/model/X_C_Opportunity.java
index d409de6679..9a5f457d06 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Opportunity.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Opportunity.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Opportunity
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Opportunity")
 public class X_C_Opportunity extends PO implements I_C_Opportunity, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Order.java b/org.adempiere.base/src/org/compiere/model/X_C_Order.java
index 4e392574f6..9db33bf64e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Order.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Order.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Order
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Order")
 public class X_C_Order extends PO implements I_C_Order, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCost.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCost.java
index 8c632add2d..7feeb643f8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCost.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCost.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for C_OrderLandedCost
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_OrderLandedCost")
 public class X_C_OrderLandedCost extends PO implements I_C_OrderLandedCost, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCostAllocation.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCostAllocation.java
index 51e9349004..0a0cb109ae 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCostAllocation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrderLandedCostAllocation.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for C_OrderLandedCostAllocation
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_OrderLandedCostAllocation")
 public class X_C_OrderLandedCostAllocation extends PO implements I_C_OrderLandedCostAllocation, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrderLine.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderLine.java
index 1cff73e846..4e7b659718 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrderLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrderLine.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_OrderLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_OrderLine")
 public class X_C_OrderLine extends PO implements I_C_OrderLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrderPaySchedule.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderPaySchedule.java
index 2d2b244f58..6c8b6b0915 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrderPaySchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrderPaySchedule.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_OrderPaySchedule
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_OrderPaySchedule")
 public class X_C_OrderPaySchedule extends PO implements I_C_OrderPaySchedule, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrderSource.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderSource.java
index d182832dac..b76dc65676 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrderSource.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrderSource.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_OrderSource
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_OrderSource")
 public class X_C_OrderSource extends PO implements I_C_OrderSource, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrderTax.java b/org.adempiere.base/src/org/compiere/model/X_C_OrderTax.java
index 856453844d..b26ff825af 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrderTax.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrderTax.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for C_OrderTax
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_OrderTax")
 public class X_C_OrderTax extends PO implements I_C_OrderTax, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_OrgAssignment.java b/org.adempiere.base/src/org/compiere/model/X_C_OrgAssignment.java
index f6d336788d..b4d9112bd6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_OrgAssignment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_OrgAssignment.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_OrgAssignment
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_OrgAssignment")
 public class X_C_OrgAssignment extends PO implements I_C_OrgAssignment, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_POS.java b/org.adempiere.base/src/org/compiere/model/X_C_POS.java
index 8615e034f1..2e670c78cc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_POS.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_POS.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_POS
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_POS")
 public class X_C_POS extends PO implements I_C_POS, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_POSKey.java b/org.adempiere.base/src/org/compiere/model/X_C_POSKey.java
index 5722b27dbc..b69102ff6e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_POSKey.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_POSKey.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_POSKey
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_POSKey")
 public class X_C_POSKey extends PO implements I_C_POSKey, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_POSKeyLayout.java b/org.adempiere.base/src/org/compiere/model/X_C_POSKeyLayout.java
index c45e375a66..cd7d3a4369 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_POSKeyLayout.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_POSKeyLayout.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_POSKeyLayout
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_POSKeyLayout")
 public class X_C_POSKeyLayout extends PO implements I_C_POSKeyLayout, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_POSPayment.java b/org.adempiere.base/src/org/compiere/model/X_C_POSPayment.java
index b5c6616c9c..2e7e21b4b7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_POSPayment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_POSPayment.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for C_POSPayment
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_POSPayment")
 public class X_C_POSPayment extends PO implements I_C_POSPayment, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_POSTenderType.java b/org.adempiere.base/src/org/compiere/model/X_C_POSTenderType.java
index f51e0a990b..edafd52779 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_POSTenderType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_POSTenderType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_POSTenderType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_POSTenderType")
 public class X_C_POSTenderType extends PO implements I_C_POSTenderType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaySchedule.java b/org.adempiere.base/src/org/compiere/model/X_C_PaySchedule.java
index 72f6b62672..88d9f403fb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaySchedule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaySchedule.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaySchedule
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_PaySchedule")
 public class X_C_PaySchedule extends PO implements I_C_PaySchedule, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaySelection.java b/org.adempiere.base/src/org/compiere/model/X_C_PaySelection.java
index 64251999f7..86961c177d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaySelection.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaySelection.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaySelection
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_PaySelection")
 public class X_C_PaySelection extends PO implements I_C_PaySelection, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionCheck.java b/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionCheck.java
index 46bdeb6836..5b887a4024 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionCheck.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionCheck.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for C_PaySelectionCheck
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_PaySelectionCheck")
 public class X_C_PaySelectionCheck extends PO implements I_C_PaySelectionCheck, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionLine.java b/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionLine.java
index edcfc161ae..d434389325 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaySelectionLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaySelectionLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_PaySelectionLine")
 public class X_C_PaySelectionLine extends PO implements I_C_PaySelectionLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Payment.java b/org.adempiere.base/src/org/compiere/model/X_C_Payment.java
index 4523d21d4f..9d199e8d0e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Payment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Payment.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Payment
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Payment")
 public class X_C_Payment extends PO implements I_C_Payment, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaymentAllocate.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentAllocate.java
index e2c8acee44..0ee2121224 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaymentAllocate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaymentAllocate.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaymentAllocate
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_PaymentAllocate")
 public class X_C_PaymentAllocate extends PO implements I_C_PaymentAllocate, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaymentBatch.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentBatch.java
index 747fcd7860..ccf96fac9f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaymentBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaymentBatch.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaymentBatch
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_PaymentBatch")
 public class X_C_PaymentBatch extends PO implements I_C_PaymentBatch, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaymentProcessor.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentProcessor.java
index c46cc3efef..c62f10b648 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaymentProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaymentProcessor.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaymentProcessor
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_PaymentProcessor")
 public class X_C_PaymentProcessor extends PO implements I_C_PaymentProcessor, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaymentTerm.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentTerm.java
index 83e44120c4..8526f027ef 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaymentTerm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaymentTerm.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PaymentTerm
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_PaymentTerm")
 public class X_C_PaymentTerm extends PO implements I_C_PaymentTerm, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PaymentTransaction.java b/org.adempiere.base/src/org/compiere/model/X_C_PaymentTransaction.java
index 929b0aa7e0..938c84ad7c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PaymentTransaction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PaymentTransaction.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for C_PaymentTransaction
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_PaymentTransaction")
 public class X_C_PaymentTransaction extends PO implements I_C_PaymentTransaction, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Period.java b/org.adempiere.base/src/org/compiere/model/X_C_Period.java
index 153e1cbc02..6a68ac21d6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Period.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Period.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Period
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Period")
 public class X_C_Period extends PO implements I_C_Period, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_PeriodControl.java b/org.adempiere.base/src/org/compiere/model/X_C_PeriodControl.java
index 98efa7ea9a..73d51afcea 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_PeriodControl.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_PeriodControl.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_PeriodControl
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_PeriodControl")
 public class X_C_PeriodControl extends PO implements I_C_PeriodControl, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Phase.java b/org.adempiere.base/src/org/compiere/model/X_C_Phase.java
index f79ae7a72a..92145dd859 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Phase.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Phase.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Phase
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Phase")
 public class X_C_Phase extends PO implements I_C_Phase, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Project.java b/org.adempiere.base/src/org/compiere/model/X_C_Project.java
index 6fc24bcf76..fd4442b1cd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Project.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Project.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Project
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Project")
 public class X_C_Project extends PO implements I_C_Project, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssue.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssue.java
index 51b5e0eda1..6165a884b7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssue.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectIssue
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ProjectIssue")
 public class X_C_ProjectIssue extends PO implements I_C_ProjectIssue, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssueMA.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssueMA.java
index 2f16cacc36..7e3b26c61e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssueMA.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ProjectIssueMA.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectIssueMA
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ProjectIssueMA")
 public class X_C_ProjectIssueMA extends PO implements I_C_ProjectIssueMA, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ProjectLine.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectLine.java
index 2dfa94aeb6..0b165dcb5f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ProjectLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ProjectLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ProjectLine")
 public class X_C_ProjectLine extends PO implements I_C_ProjectLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ProjectPhase.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectPhase.java
index 64358e3475..2491f142a2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ProjectPhase.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ProjectPhase.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectPhase
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ProjectPhase")
 public class X_C_ProjectPhase extends PO implements I_C_ProjectPhase, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ProjectTask.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectTask.java
index 1bc90f41de..8890382f8b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ProjectTask.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ProjectTask.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectTask
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ProjectTask")
 public class X_C_ProjectTask extends PO implements I_C_ProjectTask, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ProjectType.java b/org.adempiere.base/src/org/compiere/model/X_C_ProjectType.java
index 2cb3ed5bd2..1ca833bfb4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ProjectType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ProjectType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ProjectType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ProjectType")
 public class X_C_ProjectType extends PO implements I_C_ProjectType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Project_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Project_Acct.java
index 2beea42511..fc0378fd2c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Project_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Project_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_Project_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Project_Acct")
 public class X_C_Project_Acct extends PO implements I_C_Project_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Recurring.java b/org.adempiere.base/src/org/compiere/model/X_C_Recurring.java
index b06853a887..7de1151869 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Recurring.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Recurring.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Recurring
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Recurring")
 public class X_C_Recurring extends PO implements I_C_Recurring, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RecurringGroup.java b/org.adempiere.base/src/org/compiere/model/X_C_RecurringGroup.java
index 9fc4925f85..6db8bd716c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RecurringGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RecurringGroup.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RecurringGroup
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RecurringGroup")
 public class X_C_RecurringGroup extends PO implements I_C_RecurringGroup, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Recurring_Run.java b/org.adempiere.base/src/org/compiere/model/X_C_Recurring_Run.java
index 3e095b34e9..fa2b8568aa 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Recurring_Run.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Recurring_Run.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_Recurring_Run
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Recurring_Run")
 public class X_C_Recurring_Run extends PO implements I_C_Recurring_Run, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Region.java b/org.adempiere.base/src/org/compiere/model/X_C_Region.java
index b0ff7bd77e..0966223785 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Region.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Region.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Region
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Region")
 public class X_C_Region extends PO implements I_C_Region, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Remuneration.java b/org.adempiere.base/src/org/compiere/model/X_C_Remuneration.java
index ea65973bc8..a608821f57 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Remuneration.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Remuneration.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Remuneration
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Remuneration")
 public class X_C_Remuneration extends PO implements I_C_Remuneration, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecog_Service.java b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecog_Service.java
index 9dad0d1ce3..48e76ad369 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecog_Service.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecog_Service.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RevenueRecog_Service
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RevenueRecog_Service")
 public class X_C_RevenueRecog_Service extends PO implements I_C_RevenueRecog_Service, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition.java b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition.java
index efa93249e6..a511f78beb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RevenueRecognition
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RevenueRecognition")
 public class X_C_RevenueRecognition extends PO implements I_C_RevenueRecognition, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java
index 010e2362a1..7cdfa85246 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Plan.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RevenueRecognition_Plan
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RevenueRecognition_Plan")
 public class X_C_RevenueRecognition_Plan extends PO implements I_C_RevenueRecognition_Plan, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Run.java b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Run.java
index 4914133ccf..9550fcfdb8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Run.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RevenueRecognition_Run.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RevenueRecognition_Run
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RevenueRecognition_Run")
 public class X_C_RevenueRecognition_Run extends PO implements I_C_RevenueRecognition_Run, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQ.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQ.java
index 95c2f14cc0..e83a1b2e2d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQ.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQ.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQ
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RfQ")
 public class X_C_RfQ extends PO implements I_C_RfQ, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQLine.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQLine.java
index 263ae28f61..a2b87a172b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQLine.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RfQLine")
 public class X_C_RfQLine extends PO implements I_C_RfQLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQLineQty.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQLineQty.java
index da948df9d4..2b277a28f0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQLineQty.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQLineQty.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQLineQty
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RfQLineQty")
 public class X_C_RfQLineQty extends PO implements I_C_RfQLineQty, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQResponse.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponse.java
index 456a71e4ac..6001e7d162 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQResponse.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponse.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQResponse
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RfQResponse")
 public class X_C_RfQResponse extends PO implements I_C_RfQResponse, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLine.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLine.java
index 534b0b1ffe..f3440278c6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLine.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_RfQResponseLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RfQResponseLine")
 public class X_C_RfQResponseLine extends PO implements I_C_RfQResponseLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLineQty.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLineQty.java
index c4b76376ce..f32f50234b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLineQty.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQResponseLineQty.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQResponseLineQty
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RfQResponseLineQty")
 public class X_C_RfQResponseLineQty extends PO implements I_C_RfQResponseLineQty, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQ_Topic.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_Topic.java
index 15a6b5d13f..d574ea2fef 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQ_Topic.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_Topic.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQ_Topic
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RfQ_Topic")
 public class X_C_RfQ_Topic extends PO implements I_C_RfQ_Topic, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java
index dccc9d1dda..032c5eaa65 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriber.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQ_TopicSubscriber
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RfQ_TopicSubscriber")
 public class X_C_RfQ_TopicSubscriber extends PO implements I_C_RfQ_TopicSubscriber, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java
index 52ac09c9e7..0bf2d29fce 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_RfQ_TopicSubscriberOnly.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_RfQ_TopicSubscriberOnly
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_RfQ_TopicSubscriberOnly")
 public class X_C_RfQ_TopicSubscriberOnly extends PO implements I_C_RfQ_TopicSubscriberOnly, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_SalesRegion.java b/org.adempiere.base/src/org/compiere/model/X_C_SalesRegion.java
index fb6274e1c7..ea6be359c6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_SalesRegion.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_SalesRegion.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_SalesRegion
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_SalesRegion")
 public class X_C_SalesRegion extends PO implements I_C_SalesRegion, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_SalesStage.java b/org.adempiere.base/src/org/compiere/model/X_C_SalesStage.java
index 658e1ec8e5..f1d5eba890 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_SalesStage.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_SalesStage.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_SalesStage
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_SalesStage")
 public class X_C_SalesStage extends PO implements I_C_SalesStage, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevel.java b/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevel.java
index 9e3e231c17..d5cc9a960e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevel.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevel.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ServiceLevel
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ServiceLevel")
 public class X_C_ServiceLevel extends PO implements I_C_ServiceLevel, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevelLine.java b/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevelLine.java
index 5874af3854..7813595f92 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevelLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ServiceLevelLine.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ServiceLevelLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ServiceLevelLine")
 public class X_C_ServiceLevelLine extends PO implements I_C_ServiceLevelLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_SubAcct.java b/org.adempiere.base/src/org/compiere/model/X_C_SubAcct.java
index d51ff80ce9..3ceac7b7b6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_SubAcct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_SubAcct.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_SubAcct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_SubAcct")
 public class X_C_SubAcct extends PO implements I_C_SubAcct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Subscription.java b/org.adempiere.base/src/org/compiere/model/X_C_Subscription.java
index 898626095e..305c407544 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Subscription.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Subscription.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Subscription
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Subscription")
 public class X_C_Subscription extends PO implements I_C_Subscription, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_SubscriptionType.java b/org.adempiere.base/src/org/compiere/model/X_C_SubscriptionType.java
index fb51f5b719..8cbc9bd37a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_SubscriptionType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_SubscriptionType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_SubscriptionType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_SubscriptionType")
 public class X_C_SubscriptionType extends PO implements I_C_SubscriptionType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Subscription_Delivery.java b/org.adempiere.base/src/org/compiere/model/X_C_Subscription_Delivery.java
index 5a729ac55d..9bebe56732 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Subscription_Delivery.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Subscription_Delivery.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Subscription_Delivery
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Subscription_Delivery")
 public class X_C_Subscription_Delivery extends PO implements I_C_Subscription_Delivery, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Task.java b/org.adempiere.base/src/org/compiere/model/X_C_Task.java
index 26a9c7597a..3848461987 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Task.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Task.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Task
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Task")
 public class X_C_Task extends PO implements I_C_Task, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Tax.java b/org.adempiere.base/src/org/compiere/model/X_C_Tax.java
index ccef75bf7f..fbde1b3ade 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Tax.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Tax.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Tax
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Tax")
 public class X_C_Tax extends PO implements I_C_Tax, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxCategory.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxCategory.java
index 1dfd82ee03..e4f9dde732 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxCategory.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxCategory
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_TaxCategory")
 public class X_C_TaxCategory extends PO implements I_C_TaxCategory, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclaration.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclaration.java
index 432d7d47e9..15fa8e74fa 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclaration.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclaration.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxDeclaration
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_TaxDeclaration")
 public class X_C_TaxDeclaration extends PO implements I_C_TaxDeclaration, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationAcct.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationAcct.java
index ee37466d5d..3025c9d6c5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationAcct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationAcct.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for C_TaxDeclarationAcct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_TaxDeclarationAcct")
 public class X_C_TaxDeclarationAcct extends PO implements I_C_TaxDeclarationAcct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationLine.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationLine.java
index e062bd3739..4a21e01516 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxDeclarationLine.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for C_TaxDeclarationLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_TaxDeclarationLine")
 public class X_C_TaxDeclarationLine extends PO implements I_C_TaxDeclarationLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxPostal.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxPostal.java
index ee9e80b24a..7c562e9dda 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxPostal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxPostal.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxPostal
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_TaxPostal")
 public class X_C_TaxPostal extends PO implements I_C_TaxPostal, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxProvider.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxProvider.java
index 521cf372fb..8551227fb6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxProvider.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxProvider.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_TaxProvider
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_TaxProvider")
 public class X_C_TaxProvider extends PO implements I_C_TaxProvider, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_TaxProviderCfg.java b/org.adempiere.base/src/org/compiere/model/X_C_TaxProviderCfg.java
index 45cfe68d75..c57fadaecc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_TaxProviderCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_TaxProviderCfg.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_TaxProviderCfg
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_TaxProviderCfg")
 public class X_C_TaxProviderCfg extends PO implements I_C_TaxProviderCfg, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java
index 644bf282c2..7b4048c93e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Tax_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_Tax_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Tax_Acct")
 public class X_C_Tax_Acct extends PO implements I_C_Tax_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_UOM.java b/org.adempiere.base/src/org/compiere/model/X_C_UOM.java
index 0dcbe507c8..aa57bf241e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_UOM.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_UOM.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_UOM
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_UOM")
 public class X_C_UOM extends PO implements I_C_UOM, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_UOM_Conversion.java b/org.adempiere.base/src/org/compiere/model/X_C_UOM_Conversion.java
index 21c3fe6441..5aa32c16cc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_UOM_Conversion.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_UOM_Conversion.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_UOM_Conversion
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_UOM_Conversion")
 public class X_C_UOM_Conversion extends PO implements I_C_UOM_Conversion, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_UserRemuneration.java b/org.adempiere.base/src/org/compiere/model/X_C_UserRemuneration.java
index a303649611..6f6433c9e6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_UserRemuneration.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_UserRemuneration.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_UserRemuneration
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_UserRemuneration")
 public class X_C_UserRemuneration extends PO implements I_C_UserRemuneration, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_ValidCombination.java b/org.adempiere.base/src/org/compiere/model/X_C_ValidCombination.java
index 0a1cab00d6..00cd1209c1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_ValidCombination.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_ValidCombination.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_ValidCombination
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_ValidCombination")
 public class X_C_ValidCombination extends PO implements I_C_ValidCombination, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Withholding.java b/org.adempiere.base/src/org/compiere/model/X_C_Withholding.java
index e64c0caf0d..298b0801e5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Withholding.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Withholding.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Withholding
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Withholding")
 public class X_C_Withholding extends PO implements I_C_Withholding, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Withholding_Acct.java b/org.adempiere.base/src/org/compiere/model/X_C_Withholding_Acct.java
index cba72fced4..70d2a4d2c7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Withholding_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Withholding_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for C_Withholding_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Withholding_Acct")
 public class X_C_Withholding_Acct extends PO implements I_C_Withholding_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_C_Year.java b/org.adempiere.base/src/org/compiere/model/X_C_Year.java
index 8af99347a2..79acf2217a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_C_Year.java
+++ b/org.adempiere.base/src/org/compiere/model/X_C_Year.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_Year
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_Year")
 public class X_C_Year extends PO implements I_C_Year, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_EXP_Format.java b/org.adempiere.base/src/org/compiere/model/X_EXP_Format.java
index fb2116267e..497c5cd396 100644
--- a/org.adempiere.base/src/org/compiere/model/X_EXP_Format.java
+++ b/org.adempiere.base/src/org/compiere/model/X_EXP_Format.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for EXP_Format
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="EXP_Format")
 public class X_EXP_Format extends PO implements I_EXP_Format, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_EXP_FormatLine.java b/org.adempiere.base/src/org/compiere/model/X_EXP_FormatLine.java
index b6654020dc..db93272fd3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_EXP_FormatLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_EXP_FormatLine.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for EXP_FormatLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="EXP_FormatLine")
 public class X_EXP_FormatLine extends PO implements I_EXP_FormatLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_EXP_Processor.java b/org.adempiere.base/src/org/compiere/model/X_EXP_Processor.java
index 9169d89cbb..f1207a462a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_EXP_Processor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_EXP_Processor.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for EXP_Processor
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="EXP_Processor")
 public class X_EXP_Processor extends PO implements I_EXP_Processor, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_EXP_ProcessorParameter.java b/org.adempiere.base/src/org/compiere/model/X_EXP_ProcessorParameter.java
index 83b73737fb..9b70a7c8d1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_EXP_ProcessorParameter.java
+++ b/org.adempiere.base/src/org/compiere/model/X_EXP_ProcessorParameter.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for EXP_ProcessorParameter
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="EXP_ProcessorParameter")
 public class X_EXP_ProcessorParameter extends PO implements I_EXP_ProcessorParameter, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_EXP_Processor_Type.java b/org.adempiere.base/src/org/compiere/model/X_EXP_Processor_Type.java
index df003b5ed6..3d29d4a2fb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_EXP_Processor_Type.java
+++ b/org.adempiere.base/src/org/compiere/model/X_EXP_Processor_Type.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for EXP_Processor_Type
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="EXP_Processor_Type")
 public class X_EXP_Processor_Type extends PO implements I_EXP_Processor_Type, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_Fact_Acct.java b/org.adempiere.base/src/org/compiere/model/X_Fact_Acct.java
index 957f25aa1e..d3dcc70ee5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_Fact_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_Fact_Acct.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for Fact_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="Fact_Acct")
 public class X_Fact_Acct extends PO implements I_Fact_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_Fact_Acct_Summary.java b/org.adempiere.base/src/org/compiere/model/X_Fact_Acct_Summary.java
index f4778617ef..5bd8d935cf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_Fact_Acct_Summary.java
+++ b/org.adempiere.base/src/org/compiere/model/X_Fact_Acct_Summary.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for Fact_Acct_Summary
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="Fact_Acct_Summary")
 public class X_Fact_Acct_Summary extends PO implements I_Fact_Acct_Summary, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_Fact_Reconciliation.java b/org.adempiere.base/src/org/compiere/model/X_Fact_Reconciliation.java
index 0f5a099d9b..e3fb040dd8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_Fact_Reconciliation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_Fact_Reconciliation.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for Fact_Reconciliation
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="Fact_Reconciliation")
 public class X_Fact_Reconciliation extends PO implements I_Fact_Reconciliation, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_Budget.java b/org.adempiere.base/src/org/compiere/model/X_GL_Budget.java
index 730672f7ba..1263ef49be 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_Budget.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_Budget.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Budget
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="GL_Budget")
 public class X_GL_Budget extends PO implements I_GL_Budget, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_BudgetControl.java b/org.adempiere.base/src/org/compiere/model/X_GL_BudgetControl.java
index 842f3fb037..0325a7aaad 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_BudgetControl.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_BudgetControl.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_BudgetControl
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="GL_BudgetControl")
 public class X_GL_BudgetControl extends PO implements I_GL_BudgetControl, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_Category.java b/org.adempiere.base/src/org/compiere/model/X_GL_Category.java
index a08895b93c..895fbcfd54 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_Category.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_Category.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Category
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="GL_Category")
 public class X_GL_Category extends PO implements I_GL_Category, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java b/org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java
index 160590cc82..a861f1870e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_Distribution.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Distribution
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="GL_Distribution")
 public class X_GL_Distribution extends PO implements I_GL_Distribution, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_DistributionLine.java b/org.adempiere.base/src/org/compiere/model/X_GL_DistributionLine.java
index e85db0a17d..2d2022f629 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_DistributionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_DistributionLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_DistributionLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="GL_DistributionLine")
 public class X_GL_DistributionLine extends PO implements I_GL_DistributionLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_Fund.java b/org.adempiere.base/src/org/compiere/model/X_GL_Fund.java
index dec2d2da30..9576f196e4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_Fund.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_Fund.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Fund
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="GL_Fund")
 public class X_GL_Fund extends PO implements I_GL_Fund, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_FundRestriction.java b/org.adempiere.base/src/org/compiere/model/X_GL_FundRestriction.java
index 9b6bfc2e4d..99fffa3e15 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_FundRestriction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_FundRestriction.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_FundRestriction
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="GL_FundRestriction")
 public class X_GL_FundRestriction extends PO implements I_GL_FundRestriction, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_Journal.java b/org.adempiere.base/src/org/compiere/model/X_GL_Journal.java
index 26fbfcf825..a5f063fd38 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_Journal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_Journal.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_Journal
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="GL_Journal")
 public class X_GL_Journal extends PO implements I_GL_Journal, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_JournalBatch.java b/org.adempiere.base/src/org/compiere/model/X_GL_JournalBatch.java
index 686b00e59c..24955287d0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_JournalBatch.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_JournalBatch.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_JournalBatch
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="GL_JournalBatch")
 public class X_GL_JournalBatch extends PO implements I_GL_JournalBatch, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_JournalGenerator.java b/org.adempiere.base/src/org/compiere/model/X_GL_JournalGenerator.java
index 737dbf4869..c27be7ef4f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_JournalGenerator.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_JournalGenerator.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_JournalGenerator
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="GL_JournalGenerator")
 public class X_GL_JournalGenerator extends PO implements I_GL_JournalGenerator, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorLine.java b/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorLine.java
index 494e6be574..c7bd56b02a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_JournalGeneratorLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="GL_JournalGeneratorLine")
 public class X_GL_JournalGeneratorLine extends PO implements I_GL_JournalGeneratorLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorSource.java b/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorSource.java
index dc0a6162af..e16fc45fa6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorSource.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_JournalGeneratorSource.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for GL_JournalGeneratorSource
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="GL_JournalGeneratorSource")
 public class X_GL_JournalGeneratorSource extends PO implements I_GL_JournalGeneratorSource, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_GL_JournalLine.java b/org.adempiere.base/src/org/compiere/model/X_GL_JournalLine.java
index fc41180991..57276a5905 100644
--- a/org.adempiere.base/src/org/compiere/model/X_GL_JournalLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_GL_JournalLine.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for GL_JournalLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="GL_JournalLine")
 public class X_GL_JournalLine extends PO implements I_GL_JournalLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_IMP_Processor.java b/org.adempiere.base/src/org/compiere/model/X_IMP_Processor.java
index af4232f65e..6855b17ef4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_IMP_Processor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_IMP_Processor.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for IMP_Processor
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="IMP_Processor")
 public class X_IMP_Processor extends PO implements I_IMP_Processor, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorLog.java
index 2cde421201..841b6199cd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorLog.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for IMP_ProcessorLog
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="IMP_ProcessorLog")
 public class X_IMP_ProcessorLog extends PO implements I_IMP_ProcessorLog, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorParameter.java b/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorParameter.java
index 840a5e28b6..4a5a050056 100644
--- a/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorParameter.java
+++ b/org.adempiere.base/src/org/compiere/model/X_IMP_ProcessorParameter.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for IMP_ProcessorParameter
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="IMP_ProcessorParameter")
 public class X_IMP_ProcessorParameter extends PO implements I_IMP_ProcessorParameter, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_IMP_Processor_Type.java b/org.adempiere.base/src/org/compiere/model/X_IMP_Processor_Type.java
index 5c7de1f222..7d01be7dce 100644
--- a/org.adempiere.base/src/org/compiere/model/X_IMP_Processor_Type.java
+++ b/org.adempiere.base/src/org/compiere/model/X_IMP_Processor_Type.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for IMP_Processor_Type
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="IMP_Processor_Type")
 public class X_IMP_Processor_Type extends PO implements I_IMP_Processor_Type, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Asset.java b/org.adempiere.base/src/org/compiere/model/X_I_Asset.java
index f3d0e41ec5..d3f6a4f05a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Asset.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Asset.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_Asset
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_Asset")
 public class X_I_Asset extends PO implements I_I_Asset, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_BPartner.java b/org.adempiere.base/src/org/compiere/model/X_I_BPartner.java
index f8b5d39fd3..dd0d5f526b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_BPartner.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_BPartner.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_BPartner
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_BPartner")
 public class X_I_BPartner extends PO implements I_I_BPartner, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_BankStatement.java b/org.adempiere.base/src/org/compiere/model/X_I_BankStatement.java
index 4d80b8ce26..20c64f8c11 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_BankStatement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_BankStatement.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for I_BankStatement
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_BankStatement")
 public class X_I_BankStatement extends PO implements I_I_BankStatement, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Conversion_Rate.java b/org.adempiere.base/src/org/compiere/model/X_I_Conversion_Rate.java
index 5d3d77ca7c..6076ff9e22 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Conversion_Rate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Conversion_Rate.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_Conversion_Rate
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_Conversion_Rate")
 public class X_I_Conversion_Rate extends PO implements I_I_Conversion_Rate, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_ElementValue.java b/org.adempiere.base/src/org/compiere/model/X_I_ElementValue.java
index 62e3a7f462..6f06b554ec 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_ElementValue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_ElementValue.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_ElementValue
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_ElementValue")
 public class X_I_ElementValue extends PO implements I_I_ElementValue, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_FAJournal.java b/org.adempiere.base/src/org/compiere/model/X_I_FAJournal.java
index 30578c2602..ce37c25a6d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_FAJournal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_FAJournal.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_FAJournal
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_FAJournal")
 public class X_I_FAJournal extends PO implements I_I_FAJournal, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_FixedAsset.java b/org.adempiere.base/src/org/compiere/model/X_I_FixedAsset.java
index 7ad89b54c2..e1110cfd12 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_FixedAsset.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_FixedAsset.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for I_FixedAsset
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_FixedAsset")
 public class X_I_FixedAsset extends PO implements I_I_FixedAsset, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java b/org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java
index e631cd7f74..362de3a224 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_GLJournal
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_GLJournal")
 public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_InOutLineConfirm.java b/org.adempiere.base/src/org/compiere/model/X_I_InOutLineConfirm.java
index 785a79fa0c..dbe94d475e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_InOutLineConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_InOutLineConfirm.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_InOutLineConfirm
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_InOutLineConfirm")
 public class X_I_InOutLineConfirm extends PO implements I_I_InOutLineConfirm, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Inventory.java b/org.adempiere.base/src/org/compiere/model/X_I_Inventory.java
index 2ed5dbb622..6e6a794ae2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Inventory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Inventory.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_Inventory
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_Inventory")
 public class X_I_Inventory extends PO implements I_I_Inventory, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Invoice.java b/org.adempiere.base/src/org/compiere/model/X_I_Invoice.java
index 6815c17de5..6ed9383481 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Invoice.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Invoice.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for I_Invoice
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_Invoice")
 public class X_I_Invoice extends PO implements I_I_Invoice, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Order.java b/org.adempiere.base/src/org/compiere/model/X_I_Order.java
index 12e7897b78..881e02de98 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Order.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Order.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for I_Order
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_Order")
 public class X_I_Order extends PO implements I_I_Order, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Payment.java b/org.adempiere.base/src/org/compiere/model/X_I_Payment.java
index eeb78a7895..14248fed50 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Payment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Payment.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for I_Payment
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_Payment")
 public class X_I_Payment extends PO implements I_I_Payment, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_PriceList.java b/org.adempiere.base/src/org/compiere/model/X_I_PriceList.java
index dedb816f14..785fcdadf4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_PriceList.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_PriceList.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for I_PriceList
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_PriceList")
 public class X_I_PriceList extends PO implements I_I_PriceList, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_Product.java b/org.adempiere.base/src/org/compiere/model/X_I_Product.java
index 71244292a8..8963b357f2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_Product.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_Product.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_Product
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_Product")
 public class X_I_Product extends PO implements I_I_Product, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_ReportLine.java b/org.adempiere.base/src/org/compiere/model/X_I_ReportLine.java
index 50735a6dce..28a8516189 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_ReportLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_ReportLine.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for I_ReportLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_ReportLine")
 public class X_I_ReportLine extends PO implements I_I_ReportLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_MFA_Method.java b/org.adempiere.base/src/org/compiere/model/X_MFA_Method.java
index 78790f90a7..6b4270fb79 100644
--- a/org.adempiere.base/src/org/compiere/model/X_MFA_Method.java
+++ b/org.adempiere.base/src/org/compiere/model/X_MFA_Method.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for MFA_Method
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="MFA_Method")
 public class X_MFA_Method extends PO implements I_MFA_Method, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_MFA_RegisteredDevice.java b/org.adempiere.base/src/org/compiere/model/X_MFA_RegisteredDevice.java
index 3cea8ca61f..566c0e3449 100644
--- a/org.adempiere.base/src/org/compiere/model/X_MFA_RegisteredDevice.java
+++ b/org.adempiere.base/src/org/compiere/model/X_MFA_RegisteredDevice.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for MFA_RegisteredDevice
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="MFA_RegisteredDevice")
 public class X_MFA_RegisteredDevice extends PO implements I_MFA_RegisteredDevice, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_MFA_Registration.java b/org.adempiere.base/src/org/compiere/model/X_MFA_Registration.java
index 1a589ccae7..af2c468378 100644
--- a/org.adempiere.base/src/org/compiere/model/X_MFA_Registration.java
+++ b/org.adempiere.base/src/org/compiere/model/X_MFA_Registration.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for MFA_Registration
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="MFA_Registration")
 public class X_MFA_Registration extends PO implements I_MFA_Registration, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_MFA_Rule.java b/org.adempiere.base/src/org/compiere/model/X_MFA_Rule.java
index fb16dfec55..1503a861c2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_MFA_Rule.java
+++ b/org.adempiere.base/src/org/compiere/model/X_MFA_Rule.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for MFA_Rule
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="MFA_Rule")
 public class X_MFA_Rule extends PO implements I_MFA_Rule, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Attribute.java b/org.adempiere.base/src/org/compiere/model/X_M_Attribute.java
index 604f18eeb4..fbc197deeb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Attribute.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Attribute.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Attribute
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Attribute")
 public class X_M_Attribute extends PO implements I_M_Attribute, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeInstance.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeInstance.java
index 7b29474692..7aa0636ac5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeInstance.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeInstance
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_AttributeInstance")
 public class X_M_AttributeInstance extends PO implements I_M_AttributeInstance, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSearch.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSearch.java
index cc399a57e9..c7411ff12d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSearch.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSearch.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeSearch
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_AttributeSearch")
 public class X_M_AttributeSearch extends PO implements I_M_AttributeSearch, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java
index c18a3cd09f..d4be3f6d7b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSet.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeSet
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_AttributeSet")
 public class X_M_AttributeSet extends PO implements I_M_AttributeSet, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetExclude.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetExclude.java
index ef4656146b..2395b5838a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetExclude.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetExclude.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_AttributeSetExclude
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_AttributeSetExclude")
 public class X_M_AttributeSetExclude extends PO implements I_M_AttributeSetExclude, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetInstance.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetInstance.java
index a51a8e5ba7..32f5e79276 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetInstance.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeSetInstance.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeSetInstance
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_AttributeSetInstance")
 public class X_M_AttributeSetInstance extends PO implements I_M_AttributeSetInstance, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeUse.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeUse.java
index 2673d792b3..20f71e783f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeUse.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeUse.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeUse
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_AttributeUse")
 public class X_M_AttributeUse extends PO implements I_M_AttributeUse, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_AttributeValue.java b/org.adempiere.base/src/org/compiere/model/X_M_AttributeValue.java
index fcd481ac1c..38ffce9a32 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_AttributeValue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_AttributeValue.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_AttributeValue
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_AttributeValue")
 public class X_M_AttributeValue extends PO implements I_M_AttributeValue, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_BOM.java b/org.adempiere.base/src/org/compiere/model/X_M_BOM.java
index 78d4288323..2626e062f3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_BOM.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_BOM.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_BOM
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_BOM")
 public class X_M_BOM extends PO implements I_M_BOM, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_BOMAlternative.java b/org.adempiere.base/src/org/compiere/model/X_M_BOMAlternative.java
index 4c76c182bc..ed76a0706d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_BOMAlternative.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_BOMAlternative.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_BOMAlternative
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_BOMAlternative")
 public class X_M_BOMAlternative extends PO implements I_M_BOMAlternative, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_BOMProduct.java b/org.adempiere.base/src/org/compiere/model/X_M_BOMProduct.java
index 6b184b0230..795298ac03 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_BOMProduct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_BOMProduct.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_BOMProduct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_BOMProduct")
 public class X_M_BOMProduct extends PO implements I_M_BOMProduct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_BP_Price.java b/org.adempiere.base/src/org/compiere/model/X_M_BP_Price.java
index 02707436ca..13d432aa6f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_BP_Price.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_BP_Price.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_BP_Price
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_BP_Price")
 public class X_M_BP_Price extends PO implements I_M_BP_Price, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ChangeNotice.java b/org.adempiere.base/src/org/compiere/model/X_M_ChangeNotice.java
index 4a39822330..9d88f71bdf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ChangeNotice.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ChangeNotice.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ChangeNotice
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ChangeNotice")
 public class X_M_ChangeNotice extends PO implements I_M_ChangeNotice, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ChangeRequest.java b/org.adempiere.base/src/org/compiere/model/X_M_ChangeRequest.java
index 6b7c199a9b..c86f2926ce 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ChangeRequest.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ChangeRequest.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ChangeRequest
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ChangeRequest")
 public class X_M_ChangeRequest extends PO implements I_M_ChangeRequest, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_CommodityShipment.java b/org.adempiere.base/src/org/compiere/model/X_M_CommodityShipment.java
index e53237d4e8..6aa5d6b32a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_CommodityShipment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_CommodityShipment.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_CommodityShipment
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_CommodityShipment")
 public class X_M_CommodityShipment extends PO implements I_M_CommodityShipment, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Cost.java b/org.adempiere.base/src/org/compiere/model/X_M_Cost.java
index 7ee1bd68d8..048afedc7e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Cost.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Cost.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_Cost
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Cost")
 public class X_M_Cost extends PO implements I_M_Cost, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_CostDetail.java b/org.adempiere.base/src/org/compiere/model/X_M_CostDetail.java
index e7e7babfeb..db29640a19 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_CostDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_CostDetail.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_CostDetail
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_CostDetail")
 public class X_M_CostDetail extends PO implements I_M_CostDetail, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_CostElement.java b/org.adempiere.base/src/org/compiere/model/X_M_CostElement.java
index 47865c3aa6..5b9a701c27 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_CostElement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_CostElement.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_CostElement
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_CostElement")
 public class X_M_CostElement extends PO implements I_M_CostElement, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_CostHistory.java b/org.adempiere.base/src/org/compiere/model/X_M_CostHistory.java
index e8abee8f33..a0b6729cdf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_CostHistory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_CostHistory.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_CostHistory
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_CostHistory")
 public class X_M_CostHistory extends PO implements I_M_CostHistory, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_CostQueue.java b/org.adempiere.base/src/org/compiere/model/X_M_CostQueue.java
index 25e77318ec..7e3097c489 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_CostQueue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_CostQueue.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_CostQueue
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_CostQueue")
 public class X_M_CostQueue extends PO implements I_M_CostQueue, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_CostType.java b/org.adempiere.base/src/org/compiere/model/X_M_CostType.java
index 6c0cdb4691..f326169610 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_CostType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_CostType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_CostType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_CostType")
 public class X_M_CostType extends PO implements I_M_CostType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Demand.java b/org.adempiere.base/src/org/compiere/model/X_M_Demand.java
index d55e239a2a..d9587c172f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Demand.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Demand.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Demand
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Demand")
 public class X_M_Demand extends PO implements I_M_Demand, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DemandDetail.java b/org.adempiere.base/src/org/compiere/model/X_M_DemandDetail.java
index 8d4070253d..97e6341d32 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DemandDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DemandDetail.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DemandDetail
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_DemandDetail")
 public class X_M_DemandDetail extends PO implements I_M_DemandDetail, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DemandLine.java b/org.adempiere.base/src/org/compiere/model/X_M_DemandLine.java
index 795b72f57d..b9522ff293 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DemandLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DemandLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DemandLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_DemandLine")
 public class X_M_DemandLine extends PO implements I_M_DemandLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchema.java b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchema.java
index d859609511..417272e06d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchema.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DiscountSchema
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_DiscountSchema")
 public class X_M_DiscountSchema extends PO implements I_M_DiscountSchema, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaBreak.java b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaBreak.java
index 6c8fedd968..702637ca4c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaBreak.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaBreak.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DiscountSchemaBreak
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_DiscountSchemaBreak")
 public class X_M_DiscountSchemaBreak extends PO implements I_M_DiscountSchemaBreak, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaLine.java b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaLine.java
index 4cbb8591c4..6acc87f567 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DiscountSchemaLine.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DiscountSchemaLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_DiscountSchemaLine")
 public class X_M_DiscountSchemaLine extends PO implements I_M_DiscountSchemaLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DistributionList.java b/org.adempiere.base/src/org/compiere/model/X_M_DistributionList.java
index 451ed38a6d..566f8d894d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DistributionList.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DistributionList.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DistributionList
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_DistributionList")
 public class X_M_DistributionList extends PO implements I_M_DistributionList, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DistributionListLine.java b/org.adempiere.base/src/org/compiere/model/X_M_DistributionListLine.java
index a7cb770188..80efc741de 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DistributionListLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DistributionListLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DistributionListLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_DistributionListLine")
 public class X_M_DistributionListLine extends PO implements I_M_DistributionListLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DistributionRun.java b/org.adempiere.base/src/org/compiere/model/X_M_DistributionRun.java
index 0d18ea64a6..2afb582fb2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DistributionRun.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DistributionRun.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DistributionRun
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_DistributionRun")
 public class X_M_DistributionRun extends PO implements I_M_DistributionRun, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_DistributionRunLine.java b/org.adempiere.base/src/org/compiere/model/X_M_DistributionRunLine.java
index e4908ed7d5..9dbe259b40 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_DistributionRunLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_DistributionRunLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_DistributionRunLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_DistributionRunLine")
 public class X_M_DistributionRunLine extends PO implements I_M_DistributionRunLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Forecast.java b/org.adempiere.base/src/org/compiere/model/X_M_Forecast.java
index 68df85425d..8c2f91cde2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Forecast.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Forecast.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Forecast
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Forecast")
 public class X_M_Forecast extends PO implements I_M_Forecast, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ForecastLine.java b/org.adempiere.base/src/org/compiere/model/X_M_ForecastLine.java
index 8d219d9005..3d415aa22b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ForecastLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ForecastLine.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ForecastLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ForecastLine")
 public class X_M_ForecastLine extends PO implements I_M_ForecastLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Freight.java b/org.adempiere.base/src/org/compiere/model/X_M_Freight.java
index 02b94876b0..48ee655524 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Freight.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Freight.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Freight
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Freight")
 public class X_M_Freight extends PO implements I_M_Freight, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_FreightCategory.java b/org.adempiere.base/src/org/compiere/model/X_M_FreightCategory.java
index d0e3861c03..1c34990937 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_FreightCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_FreightCategory.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_FreightCategory
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_FreightCategory")
 public class X_M_FreightCategory extends PO implements I_M_FreightCategory, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InOut.java b/org.adempiere.base/src/org/compiere/model/X_M_InOut.java
index 87fffe9eb7..87acd0ccfb 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InOut.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InOut.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOut
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_InOut")
 public class X_M_InOut extends PO implements I_M_InOut, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InOutConfirm.java b/org.adempiere.base/src/org/compiere/model/X_M_InOutConfirm.java
index d8da9ef138..94d556dfec 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InOutConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InOutConfirm.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOutConfirm
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_InOutConfirm")
 public class X_M_InOutConfirm extends PO implements I_M_InOutConfirm, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InOutLine.java b/org.adempiere.base/src/org/compiere/model/X_M_InOutLine.java
index 3900c837e2..a4328d7247 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InOutLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InOutLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOutLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_InOutLine")
 public class X_M_InOutLine extends PO implements I_M_InOutLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InOutLineConfirm.java b/org.adempiere.base/src/org/compiere/model/X_M_InOutLineConfirm.java
index 468ab310ca..22b2c27a98 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InOutLineConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InOutLineConfirm.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOutLineConfirm
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_InOutLineConfirm")
 public class X_M_InOutLineConfirm extends PO implements I_M_InOutLineConfirm, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InOutLineMA.java b/org.adempiere.base/src/org/compiere/model/X_M_InOutLineMA.java
index 72b1c1373d..d436e1a573 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InOutLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InOutLineMA.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InOutLineMA
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_InOutLineMA")
 public class X_M_InOutLineMA extends PO implements I_M_InOutLineMA, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Inventory.java b/org.adempiere.base/src/org/compiere/model/X_M_Inventory.java
index fdf22d8e87..1f28e6d741 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Inventory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Inventory.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Inventory
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Inventory")
 public class X_M_Inventory extends PO implements I_M_Inventory, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InventoryLine.java b/org.adempiere.base/src/org/compiere/model/X_M_InventoryLine.java
index 5fb66e3a13..b1a6638fae 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InventoryLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InventoryLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InventoryLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_InventoryLine")
 public class X_M_InventoryLine extends PO implements I_M_InventoryLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_InventoryLineMA.java b/org.adempiere.base/src/org/compiere/model/X_M_InventoryLineMA.java
index b7b89953d5..4d2b917282 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_InventoryLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_InventoryLineMA.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_InventoryLineMA
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_InventoryLineMA")
 public class X_M_InventoryLineMA extends PO implements I_M_InventoryLineMA, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Locator.java b/org.adempiere.base/src/org/compiere/model/X_M_Locator.java
index 5b5a530aad..9d1b068b87 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Locator.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Locator.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Locator
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Locator")
 public class X_M_Locator extends PO implements I_M_Locator, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_LocatorType.java b/org.adempiere.base/src/org/compiere/model/X_M_LocatorType.java
index f8fc503609..e3b98896c5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_LocatorType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_LocatorType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_LocatorType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_LocatorType")
 public class X_M_LocatorType extends PO implements I_M_LocatorType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Lot.java b/org.adempiere.base/src/org/compiere/model/X_M_Lot.java
index 63f002e279..f749164430 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Lot.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Lot.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Lot
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Lot")
 public class X_M_Lot extends PO implements I_M_Lot, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_LotCtl.java b/org.adempiere.base/src/org/compiere/model/X_M_LotCtl.java
index fb7e17fd54..6f26bdf43e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_LotCtl.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_LotCtl.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_LotCtl
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_LotCtl")
 public class X_M_LotCtl extends PO implements I_M_LotCtl, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_LotCtlExclude.java b/org.adempiere.base/src/org/compiere/model/X_M_LotCtlExclude.java
index 0e9340ccd3..6b3aeec857 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_LotCtlExclude.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_LotCtlExclude.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_LotCtlExclude
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_LotCtlExclude")
 public class X_M_LotCtlExclude extends PO implements I_M_LotCtlExclude, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_MatchInv.java b/org.adempiere.base/src/org/compiere/model/X_M_MatchInv.java
index 5a512ce129..5a2bee9221 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_MatchInv.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_MatchInv.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MatchInv
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_MatchInv")
 public class X_M_MatchInv extends PO implements I_M_MatchInv, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_MatchPO.java b/org.adempiere.base/src/org/compiere/model/X_M_MatchPO.java
index 75e35fed9d..1307104cb7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_MatchPO.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_MatchPO.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MatchPO
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_MatchPO")
 public class X_M_MatchPO extends PO implements I_M_MatchPO, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Movement.java b/org.adempiere.base/src/org/compiere/model/X_M_Movement.java
index 5268abc730..3fba66d5ca 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Movement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Movement.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Movement
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Movement")
 public class X_M_Movement extends PO implements I_M_Movement, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_MovementConfirm.java b/org.adempiere.base/src/org/compiere/model/X_M_MovementConfirm.java
index b45ccaaeea..e57e0dda0a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_MovementConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_MovementConfirm.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MovementConfirm
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_MovementConfirm")
 public class X_M_MovementConfirm extends PO implements I_M_MovementConfirm, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_MovementLine.java b/org.adempiere.base/src/org/compiere/model/X_M_MovementLine.java
index bf13861bd9..7209312dec 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_MovementLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_MovementLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MovementLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_MovementLine")
 public class X_M_MovementLine extends PO implements I_M_MovementLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_MovementLineConfirm.java b/org.adempiere.base/src/org/compiere/model/X_M_MovementLineConfirm.java
index 42107e31bf..34f06a114b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_MovementLineConfirm.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_MovementLineConfirm.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MovementLineConfirm
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_MovementLineConfirm")
 public class X_M_MovementLineConfirm extends PO implements I_M_MovementLineConfirm, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_MovementLineMA.java b/org.adempiere.base/src/org/compiere/model/X_M_MovementLineMA.java
index 133864ffb3..43120e8293 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_MovementLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_MovementLineMA.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_MovementLineMA
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_MovementLineMA")
 public class X_M_MovementLineMA extends PO implements I_M_MovementLineMA, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_OperationResource.java b/org.adempiere.base/src/org/compiere/model/X_M_OperationResource.java
index e1d3009264..849bca2863 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_OperationResource.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_OperationResource.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_OperationResource
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_OperationResource")
 public class X_M_OperationResource extends PO implements I_M_OperationResource, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Package.java b/org.adempiere.base/src/org/compiere/model/X_M_Package.java
index 481d27f808..5203a280b9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Package.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Package.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_Package
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Package")
 public class X_M_Package extends PO implements I_M_Package, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PackageLine.java b/org.adempiere.base/src/org/compiere/model/X_M_PackageLine.java
index 25dcaa2b67..c13fcf3d2e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PackageLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PackageLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PackageLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_PackageLine")
 public class X_M_PackageLine extends PO implements I_M_PackageLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PackageMPS.java b/org.adempiere.base/src/org/compiere/model/X_M_PackageMPS.java
index fb63b1b138..a66a8d67e3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PackageMPS.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PackageMPS.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PackageMPS
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_PackageMPS")
 public class X_M_PackageMPS extends PO implements I_M_PackageMPS, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PartType.java b/org.adempiere.base/src/org/compiere/model/X_M_PartType.java
index af3eae0bda..b80ec1e924 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PartType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PartType.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_PartType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_PartType")
 public class X_M_PartType extends PO implements I_M_PartType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PerpetualInv.java b/org.adempiere.base/src/org/compiere/model/X_M_PerpetualInv.java
index 6add18f040..5008932fb9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PerpetualInv.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PerpetualInv.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PerpetualInv
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_PerpetualInv")
 public class X_M_PerpetualInv extends PO implements I_M_PerpetualInv, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PriceList.java b/org.adempiere.base/src/org/compiere/model/X_M_PriceList.java
index f15db6a669..f7bcaca04a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PriceList.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PriceList.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PriceList
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_PriceList")
 public class X_M_PriceList extends PO implements I_M_PriceList, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PriceList_Version.java b/org.adempiere.base/src/org/compiere/model/X_M_PriceList_Version.java
index 5b6ce38867..79d9ad8493 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PriceList_Version.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PriceList_Version.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PriceList_Version
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_PriceList_Version")
 public class X_M_PriceList_Version extends PO implements I_M_PriceList_Version, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product.java b/org.adempiere.base/src/org/compiere/model/X_M_Product.java
index fe438db21c..f4f7174984 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Product
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Product")
 public class X_M_Product extends PO implements I_M_Product, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductDownload.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductDownload.java
index a7f5753a74..dc585bcd19 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductDownload.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductDownload.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductDownload
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ProductDownload")
 public class X_M_ProductDownload extends PO implements I_M_ProductDownload, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductOperation.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductOperation.java
index 7c08454dcd..a6d44f8a28 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductOperation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductOperation.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductOperation
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ProductOperation")
 public class X_M_ProductOperation extends PO implements I_M_ProductOperation, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductPrice.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductPrice.java
index 4a230f3e79..d66a9e56a7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductPrice.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductPrice.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_ProductPrice
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ProductPrice")
 public class X_M_ProductPrice extends PO implements I_M_ProductPrice, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java
index a904783a7c..50234548b4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductPriceVendorBreak.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_ProductPriceVendorBreak
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ProductPriceVendorBreak")
 public class X_M_ProductPriceVendorBreak extends PO implements I_M_ProductPriceVendorBreak, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java
index f4956b5924..2a54a57acc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_Product_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Product_Acct")
 public class X_M_Product_Acct extends PO implements I_M_Product_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_BOM.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_BOM.java
index f778c65429..2597b9ae44 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product_BOM.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_BOM.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Product_BOM
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Product_BOM")
 public class X_M_Product_BOM extends PO implements I_M_Product_BOM, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_Category.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_Category.java
index 9fa8c8119c..5085c7588c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product_Category.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_Category.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Product_Category
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Product_Category")
 public class X_M_Product_Category extends PO implements I_M_Product_Category, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java
index 605b27dca3..157853f1fe 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_Category_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_Product_Category_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Product_Category_Acct")
 public class X_M_Product_Category_Acct extends PO implements I_M_Product_Category_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_PO.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_PO.java
index 2f68744eb0..29b17d43d6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product_PO.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_PO.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_Product_PO
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Product_PO")
 public class X_M_Product_PO extends PO implements I_M_Product_PO, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Product_QualityTest.java b/org.adempiere.base/src/org/compiere/model/X_M_Product_QualityTest.java
index 1ab1f90298..644a4d91e0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Product_QualityTest.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Product_QualityTest.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Product_QualityTest
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Product_QualityTest")
 public class X_M_Product_QualityTest extends PO implements I_M_Product_QualityTest, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Production.java b/org.adempiere.base/src/org/compiere/model/X_M_Production.java
index 2e275f5286..fbaf694559 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Production.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Production.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Production
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Production")
 public class X_M_Production extends PO implements I_M_Production, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java
index 53ddd5fa90..21c6956a1a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductionLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ProductionLine")
 public class X_M_ProductionLine extends PO implements I_M_ProductionLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java
index dc03ae7d6d..d29c4cf43d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductionLineMA.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductionLineMA
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ProductionLineMA")
 public class X_M_ProductionLineMA extends PO implements I_M_ProductionLineMA, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java b/org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java
index 284ca31170..58540b7e84 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ProductionPlan.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ProductionPlan
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ProductionPlan")
 public class X_M_ProductionPlan extends PO implements I_M_ProductionPlan, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Promotion.java b/org.adempiere.base/src/org/compiere/model/X_M_Promotion.java
index 6a7ef71a4f..c418f03a4a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Promotion.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Promotion.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Promotion
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Promotion")
 public class X_M_Promotion extends PO implements I_M_Promotion, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PromotionDistribution.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionDistribution.java
index 851fadd980..bc2181ee51 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PromotionDistribution.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PromotionDistribution.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_PromotionDistribution
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_PromotionDistribution")
 public class X_M_PromotionDistribution extends PO implements I_M_PromotionDistribution, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroup.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroup.java
index de12703034..459e6034f8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroup.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroup.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_PromotionGroup
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_PromotionGroup")
 public class X_M_PromotionGroup extends PO implements I_M_PromotionGroup, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroupLine.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroupLine.java
index f99a6c53bf..999a8141ef 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroupLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PromotionGroupLine.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_PromotionGroupLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_PromotionGroupLine")
 public class X_M_PromotionGroupLine extends PO implements I_M_PromotionGroupLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PromotionLine.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionLine.java
index 01b0147923..7117d01b74 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PromotionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PromotionLine.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_PromotionLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_PromotionLine")
 public class X_M_PromotionLine extends PO implements I_M_PromotionLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PromotionPreCondition.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionPreCondition.java
index 5966875700..39394b40f8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PromotionPreCondition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PromotionPreCondition.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_PromotionPreCondition
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_PromotionPreCondition")
 public class X_M_PromotionPreCondition extends PO implements I_M_PromotionPreCondition, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_PromotionReward.java b/org.adempiere.base/src/org/compiere/model/X_M_PromotionReward.java
index 34accce8a2..6631fb8d0d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_PromotionReward.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_PromotionReward.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_PromotionReward
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_PromotionReward")
 public class X_M_PromotionReward extends PO implements I_M_PromotionReward, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_QualityTest.java b/org.adempiere.base/src/org/compiere/model/X_M_QualityTest.java
index 1cb29fb1e8..0705dd57c6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_QualityTest.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_QualityTest.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_QualityTest
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_QualityTest")
 public class X_M_QualityTest extends PO implements I_M_QualityTest, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_QualityTestResult.java b/org.adempiere.base/src/org/compiere/model/X_M_QualityTestResult.java
index 144ac9c216..0f75298050 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_QualityTestResult.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_QualityTestResult.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_QualityTestResult
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_QualityTestResult")
 public class X_M_QualityTestResult extends PO implements I_M_QualityTestResult, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_RMA.java b/org.adempiere.base/src/org/compiere/model/X_M_RMA.java
index 774fa3c5ed..66a7c118b9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_RMA.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_RMA.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_RMA
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_RMA")
 public class X_M_RMA extends PO implements I_M_RMA, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_RMALine.java b/org.adempiere.base/src/org/compiere/model/X_M_RMALine.java
index 3623524f48..d96d977d9d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_RMALine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_RMALine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_RMALine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_RMALine")
 public class X_M_RMALine extends PO implements I_M_RMALine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_RMATax.java b/org.adempiere.base/src/org/compiere/model/X_M_RMATax.java
index 2024e781af..c2c468a1fc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_RMATax.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_RMATax.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_RMATax
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_RMATax")
 public class X_M_RMATax extends PO implements I_M_RMATax, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_RMAType.java b/org.adempiere.base/src/org/compiere/model/X_M_RMAType.java
index 42e0bc38f7..01a3dbbb2f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_RMAType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_RMAType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_RMAType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_RMAType")
 public class X_M_RMAType extends PO implements I_M_RMAType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_RelatedProduct.java b/org.adempiere.base/src/org/compiere/model/X_M_RelatedProduct.java
index 9be063188f..f8343b75c6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_RelatedProduct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_RelatedProduct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_RelatedProduct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_RelatedProduct")
 public class X_M_RelatedProduct extends PO implements I_M_RelatedProduct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Replenish.java b/org.adempiere.base/src/org/compiere/model/X_M_Replenish.java
index 46038fcb0c..efa8472354 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Replenish.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Replenish.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_Replenish
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Replenish")
 public class X_M_Replenish extends PO implements I_M_Replenish, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Requisition.java b/org.adempiere.base/src/org/compiere/model/X_M_Requisition.java
index 18f473768f..06032f29ad 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Requisition.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Requisition.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Requisition
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Requisition")
 public class X_M_Requisition extends PO implements I_M_Requisition, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_RequisitionLine.java b/org.adempiere.base/src/org/compiere/model/X_M_RequisitionLine.java
index b67a149733..2960fe2848 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_RequisitionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_RequisitionLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_RequisitionLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_RequisitionLine")
 public class X_M_RequisitionLine extends PO implements I_M_RequisitionLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtl.java b/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtl.java
index 0897c2ee53..cfe177845a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtl.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtl.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_SerNoCtl
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_SerNoCtl")
 public class X_M_SerNoCtl extends PO implements I_M_SerNoCtl, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtlExclude.java b/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtlExclude.java
index fda8a0882d..821db4d72b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtlExclude.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_SerNoCtlExclude.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_SerNoCtlExclude
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_SerNoCtlExclude")
 public class X_M_SerNoCtlExclude extends PO implements I_M_SerNoCtlExclude, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Shipper.java b/org.adempiere.base/src/org/compiere/model/X_M_Shipper.java
index 4bc9a6ac5b..4308c343e4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Shipper.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Shipper.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_Shipper
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Shipper")
 public class X_M_Shipper extends PO implements I_M_Shipper, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperCfg.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperCfg.java
index 9df9deff49..b851ee74b9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperCfg.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ShipperCfg
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ShipperCfg")
 public class X_M_ShipperCfg extends PO implements I_M_ShipperCfg, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabels.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabels.java
index 30159c7ad8..f010cb13e9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabels.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabels.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_ShipperLabels
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ShipperLabels")
 public class X_M_ShipperLabels extends PO implements I_M_ShipperLabels, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabelsCfg.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabelsCfg.java
index 1d910c12c4..770bbf1626 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabelsCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperLabelsCfg.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ShipperLabelsCfg
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ShipperLabelsCfg")
 public class X_M_ShipperLabelsCfg extends PO implements I_M_ShipperLabelsCfg, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackaging.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackaging.java
index 6fee580efb..5e7e57ec90 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackaging.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackaging.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_ShipperPackaging
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ShipperPackaging")
 public class X_M_ShipperPackaging extends PO implements I_M_ShipperPackaging, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackagingCfg.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackagingCfg.java
index 2a5d5da7f6..3f9ae1f0db 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackagingCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPackagingCfg.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ShipperPackagingCfg
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ShipperPackagingCfg")
 public class X_M_ShipperPackagingCfg extends PO implements I_M_ShipperPackagingCfg, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypes.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypes.java
index 3a03e47631..f503484ea9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypes.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypes.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_ShipperPickupTypes
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ShipperPickupTypes")
 public class X_M_ShipperPickupTypes extends PO implements I_M_ShipperPickupTypes, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypesCfg.java b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypesCfg.java
index e982ae655b..989cbfbd29 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypesCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShipperPickupTypesCfg.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ShipperPickupTypesCfg
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ShipperPickupTypesCfg")
 public class X_M_ShipperPickupTypesCfg extends PO implements I_M_ShipperPickupTypesCfg, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessor.java b/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessor.java
index 8247b24c06..056ab4e68b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessor.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_ShippingProcessor
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ShippingProcessor")
 public class X_M_ShippingProcessor extends PO implements I_M_ShippingProcessor, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessorCfg.java b/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessorCfg.java
index 5c3713c17d..c0f87a17b2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessorCfg.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShippingProcessorCfg.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ShippingProcessorCfg
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ShippingProcessorCfg")
 public class X_M_ShippingProcessorCfg extends PO implements I_M_ShippingProcessorCfg, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransaction.java b/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransaction.java
index aa8fba3f97..ac3496dc17 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransaction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransaction.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_ShippingTransaction
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ShippingTransaction")
 public class X_M_ShippingTransaction extends PO implements I_M_ShippingTransaction, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransactionLine.java b/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransactionLine.java
index 8449f81290..d4ff79b6a3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransactionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_ShippingTransactionLine.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_ShippingTransactionLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_ShippingTransactionLine")
 public class X_M_ShippingTransactionLine extends PO implements I_M_ShippingTransactionLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_StorageOnHand.java b/org.adempiere.base/src/org/compiere/model/X_M_StorageOnHand.java
index b996161bf1..2994e6a7a0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_StorageOnHand.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_StorageOnHand.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_StorageOnHand
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_StorageOnHand")
 public class X_M_StorageOnHand extends PO implements I_M_StorageOnHand, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_StorageReservation.java b/org.adempiere.base/src/org/compiere/model/X_M_StorageReservation.java
index 381a58897f..8c3b7127a3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_StorageReservation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_StorageReservation.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_StorageReservation
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_StorageReservation")
 public class X_M_StorageReservation extends PO implements I_M_StorageReservation, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Substitute.java b/org.adempiere.base/src/org/compiere/model/X_M_Substitute.java
index ee4c6fb951..5230cfbcc5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Substitute.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Substitute.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Substitute
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Substitute")
 public class X_M_Substitute extends PO implements I_M_Substitute, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Transaction.java b/org.adempiere.base/src/org/compiere/model/X_M_Transaction.java
index e1d72ae1c3..9d4098d5cd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Transaction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Transaction.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Transaction
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Transaction")
 public class X_M_Transaction extends PO implements I_M_Transaction, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_TransactionAllocation.java b/org.adempiere.base/src/org/compiere/model/X_M_TransactionAllocation.java
index d8bf0ef786..d5b46b6e79 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_TransactionAllocation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_TransactionAllocation.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for M_TransactionAllocation
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_TransactionAllocation")
 public class X_M_TransactionAllocation extends PO implements I_M_TransactionAllocation, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Warehouse.java b/org.adempiere.base/src/org/compiere/model/X_M_Warehouse.java
index cbcce452d8..0b1218b3a9 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Warehouse.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Warehouse.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for M_Warehouse
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Warehouse")
 public class X_M_Warehouse extends PO implements I_M_Warehouse, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java b/org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java
index cd74e8dafa..81554476b4 100644
--- a/org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java
+++ b/org.adempiere.base/src/org/compiere/model/X_M_Warehouse_Acct.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for M_Warehouse_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="M_Warehouse_Acct")
 public class X_M_Warehouse_Acct extends PO implements I_M_Warehouse_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Achievement.java b/org.adempiere.base/src/org/compiere/model/X_PA_Achievement.java
index b3eb81c721..226344a68b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Achievement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Achievement.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Achievement
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_Achievement")
 public class X_PA_Achievement extends PO implements I_PA_Achievement, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Benchmark.java b/org.adempiere.base/src/org/compiere/model/X_PA_Benchmark.java
index 3328f4cde2..039bbe2e0b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Benchmark.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Benchmark.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Benchmark
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_Benchmark")
 public class X_PA_Benchmark extends PO implements I_PA_Benchmark, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_BenchmarkData.java b/org.adempiere.base/src/org/compiere/model/X_PA_BenchmarkData.java
index 747434eaec..c9c9f177c8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_BenchmarkData.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_BenchmarkData.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_BenchmarkData
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_BenchmarkData")
 public class X_PA_BenchmarkData extends PO implements I_PA_BenchmarkData, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ColorSchema.java b/org.adempiere.base/src/org/compiere/model/X_PA_ColorSchema.java
index 41be36a596..4872ff5c2b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ColorSchema.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ColorSchema.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ColorSchema
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_ColorSchema")
 public class X_PA_ColorSchema extends PO implements I_PA_ColorSchema, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent.java b/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent.java
index 831ce5ebcd..d60bdc3da5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_DashboardContent
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_DashboardContent")
 public class X_PA_DashboardContent extends PO implements I_PA_DashboardContent, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent_Access.java b/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent_Access.java
index 6c6841c1cd..6adadaa32a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent_Access.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_DashboardContent_Access.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for PA_DashboardContent_Access
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_DashboardContent_Access")
 public class X_PA_DashboardContent_Access extends PO implements I_PA_DashboardContent_Access, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_DashboardPreference.java b/org.adempiere.base/src/org/compiere/model/X_PA_DashboardPreference.java
index 11061e5c16..d35dd2c9dc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_DashboardPreference.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_DashboardPreference.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for PA_DashboardPreference
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_DashboardPreference")
 public class X_PA_DashboardPreference extends PO implements I_PA_DashboardPreference, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_DocumentStatus.java b/org.adempiere.base/src/org/compiere/model/X_PA_DocumentStatus.java
index 80badd7667..04d95b5913 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_DocumentStatus.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_DocumentStatus.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for PA_DocumentStatus
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_DocumentStatus")
 public class X_PA_DocumentStatus extends PO implements I_PA_DocumentStatus, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Goal.java b/org.adempiere.base/src/org/compiere/model/X_PA_Goal.java
index 8633ebfa50..2e0490d567 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Goal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Goal.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Goal
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_Goal")
 public class X_PA_Goal extends PO implements I_PA_Goal, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_GoalRestriction.java b/org.adempiere.base/src/org/compiere/model/X_PA_GoalRestriction.java
index 7779ad9627..e767b9ca2c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_GoalRestriction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_GoalRestriction.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_GoalRestriction
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_GoalRestriction")
 public class X_PA_GoalRestriction extends PO implements I_PA_GoalRestriction, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Hierarchy.java b/org.adempiere.base/src/org/compiere/model/X_PA_Hierarchy.java
index 2e352232a3..42ae35d902 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Hierarchy.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Hierarchy.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Hierarchy
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_Hierarchy")
 public class X_PA_Hierarchy extends PO implements I_PA_Hierarchy, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Measure.java b/org.adempiere.base/src/org/compiere/model/X_PA_Measure.java
index 7fa816acf7..37dba7c9a8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Measure.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Measure.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Measure
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_Measure")
 public class X_PA_Measure extends PO implements I_PA_Measure, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_MeasureCalc.java b/org.adempiere.base/src/org/compiere/model/X_PA_MeasureCalc.java
index 64888025d2..91809ba5e3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_MeasureCalc.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_MeasureCalc.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_MeasureCalc
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_MeasureCalc")
 public class X_PA_MeasureCalc extends PO implements I_PA_MeasureCalc, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Ratio.java b/org.adempiere.base/src/org/compiere/model/X_PA_Ratio.java
index eb70bf1c92..7e62ef6615 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Ratio.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Ratio.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Ratio
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_Ratio")
 public class X_PA_Ratio extends PO implements I_PA_Ratio, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_RatioElement.java b/org.adempiere.base/src/org/compiere/model/X_PA_RatioElement.java
index 9037accb0f..9d59b5e85b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_RatioElement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_RatioElement.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_RatioElement
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_RatioElement")
 public class X_PA_RatioElement extends PO implements I_PA_RatioElement, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_Report.java b/org.adempiere.base/src/org/compiere/model/X_PA_Report.java
index 7cc406e746..06388b2ac7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_Report.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_Report.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_Report
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_Report")
 public class X_PA_Report extends PO implements I_PA_Report, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumn.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumn.java
index e4f6b7280d..cd27dd8aba 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumn.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportColumn
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_ReportColumn")
 public class X_PA_ReportColumn extends PO implements I_PA_ReportColumn, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumnSet.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumnSet.java
index 182f0f1fc1..e75ca8884b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumnSet.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ReportColumnSet.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportColumnSet
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_ReportColumnSet")
 public class X_PA_ReportColumnSet extends PO implements I_PA_ReportColumnSet, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ReportCube.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportCube.java
index 817ab6763c..34971e30a1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ReportCube.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ReportCube.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportCube
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_ReportCube")
 public class X_PA_ReportCube extends PO implements I_PA_ReportCube, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ReportLine.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportLine.java
index a2a873a0ef..edf18e1fa6 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ReportLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ReportLine.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_ReportLine")
 public class X_PA_ReportLine extends PO implements I_PA_ReportLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ReportLineSet.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportLineSet.java
index bccba82c78..712891b39a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ReportLineSet.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ReportLineSet.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportLineSet
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_ReportLineSet")
 public class X_PA_ReportLineSet extends PO implements I_PA_ReportLineSet, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_ReportSource.java b/org.adempiere.base/src/org/compiere/model/X_PA_ReportSource.java
index 0f4536169a..3243d57f96 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_ReportSource.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_ReportSource.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_ReportSource
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_ReportSource")
 public class X_PA_ReportSource extends PO implements I_PA_ReportSource, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Criteria.java b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Criteria.java
index 8ce63380d5..fd088c8674 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Criteria.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Criteria.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_SLA_Criteria
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_SLA_Criteria")
 public class X_PA_SLA_Criteria extends PO implements I_PA_SLA_Criteria, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Goal.java b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Goal.java
index 64f9e9aaa6..3adb79e8b8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Goal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Goal.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_SLA_Goal
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_SLA_Goal")
 public class X_PA_SLA_Goal extends PO implements I_PA_SLA_Goal, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Measure.java b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Measure.java
index 88419ca8b7..6875864dd2 100644
--- a/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Measure.java
+++ b/org.adempiere.base/src/org/compiere/model/X_PA_SLA_Measure.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PA_SLA_Measure
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PA_SLA_Measure")
 public class X_PA_SLA_Measure extends PO implements I_PA_SLA_Measure, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_RV_BPartner.java b/org.adempiere.base/src/org/compiere/model/X_RV_BPartner.java
index 4e2cbd760e..603ca4d8f5 100644
--- a/org.adempiere.base/src/org/compiere/model/X_RV_BPartner.java
+++ b/org.adempiere.base/src/org/compiere/model/X_RV_BPartner.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for RV_BPartner
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="RV_BPartner")
 public class X_RV_BPartner extends PO implements I_RV_BPartner, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_RV_WarehousePrice.java b/org.adempiere.base/src/org/compiere/model/X_RV_WarehousePrice.java
index 48afd8cfdc..7f7ea36dbc 100644
--- a/org.adempiere.base/src/org/compiere/model/X_RV_WarehousePrice.java
+++ b/org.adempiere.base/src/org/compiere/model/X_RV_WarehousePrice.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for RV_WarehousePrice
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="RV_WarehousePrice")
 public class X_RV_WarehousePrice extends PO implements I_RV_WarehousePrice, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_Category.java b/org.adempiere.base/src/org/compiere/model/X_R_Category.java
index eb352e2e83..50f80183ca 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_Category.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_Category.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Category
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_Category")
 public class X_R_Category extends PO implements I_R_Category, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_CategoryUpdates.java b/org.adempiere.base/src/org/compiere/model/X_R_CategoryUpdates.java
index 87b05b8e61..c543005181 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_CategoryUpdates.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_CategoryUpdates.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for R_CategoryUpdates
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_CategoryUpdates")
 public class X_R_CategoryUpdates extends PO implements I_R_CategoryUpdates, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_ContactInterest.java b/org.adempiere.base/src/org/compiere/model/X_R_ContactInterest.java
index 5f5a66f840..8a4d76d420 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_ContactInterest.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_ContactInterest.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_ContactInterest
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_ContactInterest")
 public class X_R_ContactInterest extends PO implements I_R_ContactInterest, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_Group.java b/org.adempiere.base/src/org/compiere/model/X_R_Group.java
index 6139f68cdc..1085193454 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_Group.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_Group.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Group
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_Group")
 public class X_R_Group extends PO implements I_R_Group, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_GroupUpdates.java b/org.adempiere.base/src/org/compiere/model/X_R_GroupUpdates.java
index 0f60888bab..017e3ebe07 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_GroupUpdates.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_GroupUpdates.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for R_GroupUpdates
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_GroupUpdates")
 public class X_R_GroupUpdates extends PO implements I_R_GroupUpdates, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_InterestArea.java b/org.adempiere.base/src/org/compiere/model/X_R_InterestArea.java
index 5bb76bd2c2..263cc102a8 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_InterestArea.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_InterestArea.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_InterestArea
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_InterestArea")
 public class X_R_InterestArea extends PO implements I_R_InterestArea, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_IssueKnown.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueKnown.java
index af28bdc3ab..e90ff0522e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_IssueKnown.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_IssueKnown.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueKnown
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_IssueKnown")
 public class X_R_IssueKnown extends PO implements I_R_IssueKnown, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_IssueProject.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueProject.java
index 68843719fe..ce11cc704a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_IssueProject.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_IssueProject.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueProject
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_IssueProject")
 public class X_R_IssueProject extends PO implements I_R_IssueProject, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_IssueRecommendation.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueRecommendation.java
index 76c7634bb6..52b6581201 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_IssueRecommendation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_IssueRecommendation.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueRecommendation
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_IssueRecommendation")
 public class X_R_IssueRecommendation extends PO implements I_R_IssueRecommendation, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_IssueStatus.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueStatus.java
index aa079dde43..00698ed0f1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_IssueStatus.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_IssueStatus.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueStatus
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_IssueStatus")
 public class X_R_IssueStatus extends PO implements I_R_IssueStatus, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_IssueSystem.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueSystem.java
index 7e9d7cdc3f..a327d7c21a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_IssueSystem.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_IssueSystem.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueSystem
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_IssueSystem")
 public class X_R_IssueSystem extends PO implements I_R_IssueSystem, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_IssueUser.java b/org.adempiere.base/src/org/compiere/model/X_R_IssueUser.java
index aedfcdc94a..989e13b90e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_IssueUser.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_IssueUser.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_IssueUser
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_IssueUser")
 public class X_R_IssueUser extends PO implements I_R_IssueUser, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_MailText.java b/org.adempiere.base/src/org/compiere/model/X_R_MailText.java
index cee6465209..a174782cab 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_MailText.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_MailText.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_MailText
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_MailText")
 public class X_R_MailText extends PO implements I_R_MailText, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_Request.java b/org.adempiere.base/src/org/compiere/model/X_R_Request.java
index fd77c5d579..3f95b55c24 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_Request.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_Request.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Request
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_Request")
 public class X_R_Request extends PO implements I_R_Request, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestAction.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestAction.java
index 7749babc78..ec457f9992 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestAction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestAction.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for R_RequestAction
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_RequestAction")
 public class X_R_RequestAction extends PO implements I_R_RequestAction, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor.java
index f8dc17c4ea..eddbaa2f10 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_RequestProcessor
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_RequestProcessor")
 public class X_R_RequestProcessor extends PO implements I_R_RequestProcessor, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessorLog.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessorLog.java
index aa69f67dba..ab509513b3 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessorLog.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessorLog.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for R_RequestProcessorLog
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_RequestProcessorLog")
 public class X_R_RequestProcessorLog extends PO implements I_R_RequestProcessorLog, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor_Route.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor_Route.java
index 5f2b8d56eb..8283e1ab0c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor_Route.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestProcessor_Route.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_RequestProcessor_Route
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_RequestProcessor_Route")
 public class X_R_RequestProcessor_Route extends PO implements I_R_RequestProcessor_Route, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestType.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestType.java
index ee6a8cec8b..2ceb38a6d1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_RequestType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_RequestType")
 public class X_R_RequestType extends PO implements I_R_RequestType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestTypeUpdates.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestTypeUpdates.java
index 5ca29de3c5..ced76f0c7e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestTypeUpdates.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestTypeUpdates.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for R_RequestTypeUpdates
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_RequestTypeUpdates")
 public class X_R_RequestTypeUpdates extends PO implements I_R_RequestTypeUpdates, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdate.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdate.java
index 27f1469f3f..cec78482f0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdate.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdate.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_RequestUpdate
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_RequestUpdate")
 public class X_R_RequestUpdate extends PO implements I_R_RequestUpdate, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdates.java b/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdates.java
index 818989621c..1b64fba982 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdates.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_RequestUpdates.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for R_RequestUpdates
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_RequestUpdates")
 public class X_R_RequestUpdates extends PO implements I_R_RequestUpdates, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_Resolution.java b/org.adempiere.base/src/org/compiere/model/X_R_Resolution.java
index 11cdf452e2..38c3bc9377 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_Resolution.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_Resolution.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Resolution
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_Resolution")
 public class X_R_Resolution extends PO implements I_R_Resolution, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_StandardResponse.java b/org.adempiere.base/src/org/compiere/model/X_R_StandardResponse.java
index 704df3f08f..2a5af4c79d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_StandardResponse.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_StandardResponse.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_StandardResponse
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_StandardResponse")
 public class X_R_StandardResponse extends PO implements I_R_StandardResponse, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_Status.java b/org.adempiere.base/src/org/compiere/model/X_R_Status.java
index 8ed36a534b..de42f020a0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_Status.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_Status.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_Status
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_Status")
 public class X_R_Status extends PO implements I_R_Status, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_R_StatusCategory.java b/org.adempiere.base/src/org/compiere/model/X_R_StatusCategory.java
index 474233846e..99dc9904ab 100644
--- a/org.adempiere.base/src/org/compiere/model/X_R_StatusCategory.java
+++ b/org.adempiere.base/src/org/compiere/model/X_R_StatusCategory.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for R_StatusCategory
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="R_StatusCategory")
 public class X_R_StatusCategory extends PO implements I_R_StatusCategory, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_ExpenseType.java b/org.adempiere.base/src/org/compiere/model/X_S_ExpenseType.java
index c7494bcbc9..a0cbf35a0f 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_ExpenseType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_ExpenseType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_ExpenseType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="S_ExpenseType")
 public class X_S_ExpenseType extends PO implements I_S_ExpenseType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_Resource.java b/org.adempiere.base/src/org/compiere/model/X_S_Resource.java
index 98bc05b03c..1544a08c98 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_Resource.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_Resource.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_Resource
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="S_Resource")
 public class X_S_Resource extends PO implements I_S_Resource, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_ResourceAssignment.java b/org.adempiere.base/src/org/compiere/model/X_S_ResourceAssignment.java
index 997e70a2f8..d94800224c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_ResourceAssignment.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_ResourceAssignment.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_ResourceAssignment
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="S_ResourceAssignment")
 public class X_S_ResourceAssignment extends PO implements I_S_ResourceAssignment, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_ResourceType.java b/org.adempiere.base/src/org/compiere/model/X_S_ResourceType.java
index ac45766f1d..2c6e6868d7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_ResourceType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_ResourceType.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_ResourceType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="S_ResourceType")
 public class X_S_ResourceType extends PO implements I_S_ResourceType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_ResourceUnAvailable.java b/org.adempiere.base/src/org/compiere/model/X_S_ResourceUnAvailable.java
index f5c9984288..26be621626 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_ResourceUnAvailable.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_ResourceUnAvailable.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_ResourceUnAvailable
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="S_ResourceUnAvailable")
 public class X_S_ResourceUnAvailable extends PO implements I_S_ResourceUnAvailable, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_TimeExpense.java b/org.adempiere.base/src/org/compiere/model/X_S_TimeExpense.java
index a940ba65c4..6ebb26cdbd 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_TimeExpense.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_TimeExpense.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_TimeExpense
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="S_TimeExpense")
 public class X_S_TimeExpense extends PO implements I_S_TimeExpense, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_TimeExpenseLine.java b/org.adempiere.base/src/org/compiere/model/X_S_TimeExpenseLine.java
index cbb8f20129..0a6f384677 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_TimeExpenseLine.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_TimeExpenseLine.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_TimeExpenseLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="S_TimeExpenseLine")
 public class X_S_TimeExpenseLine extends PO implements I_S_TimeExpenseLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_TimeType.java b/org.adempiere.base/src/org/compiere/model/X_S_TimeType.java
index 97dcaa5846..25c017ea64 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_TimeType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_TimeType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_TimeType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="S_TimeType")
 public class X_S_TimeType extends PO implements I_S_TimeType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_Training.java b/org.adempiere.base/src/org/compiere/model/X_S_Training.java
index a142da65df..3a79be1ec7 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_Training.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_Training.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_Training
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="S_Training")
 public class X_S_Training extends PO implements I_S_Training, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_S_Training_Class.java b/org.adempiere.base/src/org/compiere/model/X_S_Training_Class.java
index 6a85599eae..337d70ba37 100644
--- a/org.adempiere.base/src/org/compiere/model/X_S_Training_Class.java
+++ b/org.adempiere.base/src/org/compiere/model/X_S_Training_Class.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for S_Training_Class
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="S_Training_Class")
 public class X_S_Training_Class extends PO implements I_S_Training_Class, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_1099Extract.java b/org.adempiere.base/src/org/compiere/model/X_T_1099Extract.java
index eef98f98d9..e81bd5f737 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_1099Extract.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_1099Extract.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for T_1099Extract
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_1099Extract")
 public class X_T_1099Extract extends PO implements I_T_1099Extract, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_Aging.java b/org.adempiere.base/src/org/compiere/model/X_T_Aging.java
index 0cda7ff35c..fd183043db 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_Aging.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_Aging.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for T_Aging
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_Aging")
 public class X_T_Aging extends PO implements I_T_Aging, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_BOM_Indented.java b/org.adempiere.base/src/org/compiere/model/X_T_BOM_Indented.java
index 42da9ea77f..36579b97a0 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_BOM_Indented.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_BOM_Indented.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for T_BOM_Indented
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_BOM_Indented")
 public class X_T_BOM_Indented extends PO implements I_T_BOM_Indented, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_BankRegister.java b/org.adempiere.base/src/org/compiere/model/X_T_BankRegister.java
index 2e76f94258..7e2a82a255 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_BankRegister.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_BankRegister.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for T_BankRegister
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_BankRegister")
 public class X_T_BankRegister extends PO implements I_T_BankRegister, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_CashFlow.java b/org.adempiere.base/src/org/compiere/model/X_T_CashFlow.java
index 3b94a210ae..acbbbb962e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_CashFlow.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_CashFlow.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for T_CashFlow
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_CashFlow")
 public class X_T_CashFlow extends PO implements I_T_CashFlow, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_DistributionRunDetail.java b/org.adempiere.base/src/org/compiere/model/X_T_DistributionRunDetail.java
index b290976984..6b8d6c4a78 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_DistributionRunDetail.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_DistributionRunDetail.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for T_DistributionRunDetail
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_DistributionRunDetail")
 public class X_T_DistributionRunDetail extends PO implements I_T_DistributionRunDetail, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_InventoryValue.java b/org.adempiere.base/src/org/compiere/model/X_T_InventoryValue.java
index e56fd46f38..24a7825d81 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_InventoryValue.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_InventoryValue.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for T_InventoryValue
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_InventoryValue")
 public class X_T_InventoryValue extends PO implements I_T_InventoryValue, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_InvoiceGL.java b/org.adempiere.base/src/org/compiere/model/X_T_InvoiceGL.java
index 275b4fd3a5..c216fffa86 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_InvoiceGL.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_InvoiceGL.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for T_InvoiceGL
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_InvoiceGL")
 public class X_T_InvoiceGL extends PO implements I_T_InvoiceGL, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_Reconciliation.java b/org.adempiere.base/src/org/compiere/model/X_T_Reconciliation.java
index 0f5ecfbceb..7891eea98a 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_Reconciliation.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_Reconciliation.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for T_Reconciliation
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_Reconciliation")
 public class X_T_Reconciliation extends PO implements I_T_Reconciliation, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_Replenish.java b/org.adempiere.base/src/org/compiere/model/X_T_Replenish.java
index 8944525a32..8aa4214ddf 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_Replenish.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_Replenish.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for T_Replenish
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_Replenish")
 public class X_T_Replenish extends PO implements I_T_Replenish, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_Report.java b/org.adempiere.base/src/org/compiere/model/X_T_Report.java
index 35459ff592..25d3135419 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_Report.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_Report.java
@@ -20,14 +20,12 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for T_Report
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_Report")
 public class X_T_Report extends PO implements I_T_Report, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_ReportStatement.java b/org.adempiere.base/src/org/compiere/model/X_T_ReportStatement.java
index 0957169bc2..0aac68586e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_ReportStatement.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_ReportStatement.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for T_ReportStatement
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_ReportStatement")
 public class X_T_ReportStatement extends PO implements I_T_ReportStatement, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_T_Transaction.java b/org.adempiere.base/src/org/compiere/model/X_T_Transaction.java
index 97ae04b67d..c5f652c47c 100644
--- a/org.adempiere.base/src/org/compiere/model/X_T_Transaction.java
+++ b/org.adempiere.base/src/org/compiere/model/X_T_Transaction.java
@@ -21,13 +21,11 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for T_Transaction
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_Transaction")
 public class X_T_Transaction extends PO implements I_T_Transaction, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_Test.java b/org.adempiere.base/src/org/compiere/model/X_Test.java
index 3a716f665b..275c6896b1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_Test.java
+++ b/org.adempiere.base/src/org/compiere/model/X_Test.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for Test
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="Test")
 public class X_Test extends PO implements I_Test, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_U_BlackListCheque.java b/org.adempiere.base/src/org/compiere/model/X_U_BlackListCheque.java
index deedf185e7..aaac523b13 100644
--- a/org.adempiere.base/src/org/compiere/model/X_U_BlackListCheque.java
+++ b/org.adempiere.base/src/org/compiere/model/X_U_BlackListCheque.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for U_BlackListCheque
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="U_BlackListCheque")
 public class X_U_BlackListCheque extends PO implements I_U_BlackListCheque, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_U_POSTerminal.java b/org.adempiere.base/src/org/compiere/model/X_U_POSTerminal.java
index a1c92ff601..6c25820b31 100644
--- a/org.adempiere.base/src/org/compiere/model/X_U_POSTerminal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_U_POSTerminal.java
@@ -20,12 +20,10 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for U_POSTerminal
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="U_POSTerminal")
 public class X_U_POSTerminal extends PO implements I_U_POSTerminal, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_U_RoleMenu.java b/org.adempiere.base/src/org/compiere/model/X_U_RoleMenu.java
index 86703bdc37..39e505380e 100644
--- a/org.adempiere.base/src/org/compiere/model/X_U_RoleMenu.java
+++ b/org.adempiere.base/src/org/compiere/model/X_U_RoleMenu.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for U_RoleMenu
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="U_RoleMenu")
 public class X_U_RoleMenu extends PO implements I_U_RoleMenu, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_U_WebMenu.java b/org.adempiere.base/src/org/compiere/model/X_U_WebMenu.java
index a9152009eb..3022346495 100644
--- a/org.adempiere.base/src/org/compiere/model/X_U_WebMenu.java
+++ b/org.adempiere.base/src/org/compiere/model/X_U_WebMenu.java
@@ -20,13 +20,11 @@ package org.compiere.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.Env;
 
 /** Generated Model for U_WebMenu
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="U_WebMenu")
 public class X_U_WebMenu extends PO implements I_U_WebMenu, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_U_Web_Properties.java b/org.adempiere.base/src/org/compiere/model/X_U_Web_Properties.java
index 7cfeb76be6..668946d5d1 100644
--- a/org.adempiere.base/src/org/compiere/model/X_U_Web_Properties.java
+++ b/org.adempiere.base/src/org/compiere/model/X_U_Web_Properties.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for U_Web_Properties
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="U_Web_Properties")
 public class X_U_Web_Properties extends PO implements I_U_Web_Properties, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebService.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebService.java
index 46c6bb4836..0b606a741d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebService.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebService.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for WS_WebService
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="WS_WebService")
 public class X_WS_WebService extends PO implements I_WS_WebService, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldInput.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldInput.java
index 35e016a4bc..0f6152a992 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldInput.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldInput.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for WS_WebServiceFieldInput
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="WS_WebServiceFieldInput")
 public class X_WS_WebServiceFieldInput extends PO implements I_WS_WebServiceFieldInput, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldOutput.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldOutput.java
index 1eca5a935f..46f8e69d2d 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldOutput.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceFieldOutput.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for WS_WebServiceFieldOutput
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="WS_WebServiceFieldOutput")
 public class X_WS_WebServiceFieldOutput extends PO implements I_WS_WebServiceFieldOutput, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceMethod.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceMethod.java
index ca549448d6..bc09ae0e80 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceMethod.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceMethod.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for WS_WebServiceMethod
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="WS_WebServiceMethod")
 public class X_WS_WebServiceMethod extends PO implements I_WS_WebServiceMethod, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceType.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceType.java
index 009b3940cb..8af84af40b 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceType.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceType.java
@@ -19,13 +19,11 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for WS_WebServiceType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="WS_WebServiceType")
 public class X_WS_WebServiceType extends PO implements I_WS_WebServiceType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceTypeAccess.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceTypeAccess.java
index d23082a5a1..cdeb627041 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceTypeAccess.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebServiceTypeAccess.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for WS_WebServiceTypeAccess
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="WS_WebServiceTypeAccess")
 public class X_WS_WebServiceTypeAccess extends PO implements I_WS_WebServiceTypeAccess, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/compiere/model/X_WS_WebService_Para.java b/org.adempiere.base/src/org/compiere/model/X_WS_WebService_Para.java
index 63080feb6d..f17c88f459 100644
--- a/org.adempiere.base/src/org/compiere/model/X_WS_WebService_Para.java
+++ b/org.adempiere.base/src/org/compiere/model/X_WS_WebService_Para.java
@@ -19,12 +19,10 @@ package org.compiere.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 
 /** Generated Model for WS_WebService_Para
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="WS_WebService_Para")
 public class X_WS_WebService_Para extends PO implements I_WS_WebService_Para, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_C_TaxBase.java b/org.adempiere.base/src/org/eevolution/model/X_C_TaxBase.java
index dcc6296c6a..44d17dd1b0 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_C_TaxBase.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_C_TaxBase.java
@@ -19,14 +19,12 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxBase
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_TaxBase")
 public class X_C_TaxBase extends PO implements I_C_TaxBase, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_C_TaxDefinition.java b/org.adempiere.base/src/org/eevolution/model/X_C_TaxDefinition.java
index 69c946fa85..9c029c9bd2 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_C_TaxDefinition.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_C_TaxDefinition.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxDefinition
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_TaxDefinition")
 public class X_C_TaxDefinition extends PO implements I_C_TaxDefinition, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_C_TaxGroup.java b/org.adempiere.base/src/org/eevolution/model/X_C_TaxGroup.java
index eec5406973..ee82e2de15 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_C_TaxGroup.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_C_TaxGroup.java
@@ -19,14 +19,12 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxGroup
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_TaxGroup")
 public class X_C_TaxGroup extends PO implements I_C_TaxGroup, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_C_TaxType.java b/org.adempiere.base/src/org/eevolution/model/X_C_TaxType.java
index f12351bed8..b926e06cbb 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_C_TaxType.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_C_TaxType.java
@@ -19,14 +19,12 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for C_TaxType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="C_TaxType")
 public class X_C_TaxType extends PO implements I_C_TaxType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistribution.java b/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistribution.java
index 32e7b13415..99b8aa5bdb 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistribution.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistribution.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for DD_NetworkDistribution
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="DD_NetworkDistribution")
 public class X_DD_NetworkDistribution extends PO implements I_DD_NetworkDistribution, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java b/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java
index eb8ca376b1..02e96dd6a6 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_DD_NetworkDistributionLine.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 
 /** Generated Model for DD_NetworkDistributionLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="DD_NetworkDistributionLine")
 public class X_DD_NetworkDistributionLine extends PO implements I_DD_NetworkDistributionLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_DD_Order.java b/org.adempiere.base/src/org/eevolution/model/X_DD_Order.java
index df0ddd422f..94c950dfc2 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_DD_Order.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_DD_Order.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -29,7 +28,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for DD_Order
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="DD_Order")
 public class X_DD_Order extends PO implements I_DD_Order, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_DD_OrderLine.java b/org.adempiere.base/src/org/eevolution/model/X_DD_OrderLine.java
index b053d1480e..42d2a03939 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_DD_OrderLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_DD_OrderLine.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -29,7 +28,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for DD_OrderLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="DD_OrderLine")
 public class X_DD_OrderLine extends PO implements I_DD_OrderLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Attribute.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Attribute.java
index a2a3adaecc..87e897bd84 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Attribute.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Attribute.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 
 /** Generated Model for HR_Attribute
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_Attribute")
 public class X_HR_Attribute extends PO implements I_HR_Attribute, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Concept.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept.java
index 862d83020d..c11eadbb38 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Concept.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Concept
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_Concept")
 public class X_HR_Concept extends PO implements I_HR_Concept, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Acct.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Acct.java
index 9fab59979a..05ccb9ff8d 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Acct.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Acct.java
@@ -19,13 +19,11 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 
 /** Generated Model for HR_Concept_Acct
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_Concept_Acct")
 public class X_HR_Concept_Acct extends PO implements I_HR_Concept_Acct, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Category.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Category.java
index 4cbe77e6eb..e16a01c7e9 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Category.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Concept_Category.java
@@ -19,14 +19,12 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Concept_Category
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_Concept_Category")
 public class X_HR_Concept_Category extends PO implements I_HR_Concept_Category, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Contract.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Contract.java
index 98a3393007..e072bede82 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Contract.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Contract.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Contract
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_Contract")
 public class X_HR_Contract extends PO implements I_HR_Contract, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Department.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Department.java
index 52da8acae3..6ae2619ef2 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Department.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Department.java
@@ -19,14 +19,12 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Department
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_Department")
 public class X_HR_Department extends PO implements I_HR_Department, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Employee.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Employee.java
index 9847b199ec..6a53e8d056 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Employee.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Employee.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Employee
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_Employee")
 public class X_HR_Employee extends PO implements I_HR_Employee, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Job.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Job.java
index 4f0a336892..7aeb1fd2b1 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Job.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Job.java
@@ -19,14 +19,12 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Job
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_Job")
 public class X_HR_Job extends PO implements I_HR_Job, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_List.java b/org.adempiere.base/src/org/eevolution/model/X_HR_List.java
index 1a655fe4b4..ae27dad3eb 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_List.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_List.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_List
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_List")
 public class X_HR_List extends PO implements I_HR_List, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_ListLine.java b/org.adempiere.base/src/org/eevolution/model/X_HR_ListLine.java
index 43a64f0135..4ac3bf3486 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_ListLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_ListLine.java
@@ -20,7 +20,6 @@ package org.eevolution.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -28,7 +27,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for HR_ListLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_ListLine")
 public class X_HR_ListLine extends PO implements I_HR_ListLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_ListType.java b/org.adempiere.base/src/org/eevolution/model/X_HR_ListType.java
index 0d66646653..891c739117 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_ListType.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_ListType.java
@@ -19,14 +19,12 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_ListType
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_ListType")
 public class X_HR_ListType extends PO implements I_HR_ListType, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_ListVersion.java b/org.adempiere.base/src/org/eevolution/model/X_HR_ListVersion.java
index 16456188ca..061beb1574 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_ListVersion.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_ListVersion.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_ListVersion
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_ListVersion")
 public class X_HR_ListVersion extends PO implements I_HR_ListVersion, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Movement.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Movement.java
index e0dd9fe5e6..efde999209 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Movement.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Movement.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -29,7 +28,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for HR_Movement
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_Movement")
 public class X_HR_Movement extends PO implements I_HR_Movement, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Payroll.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Payroll.java
index 20cafefaf5..3d16be20d5 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Payroll.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Payroll.java
@@ -19,14 +19,12 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Payroll
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_Payroll")
 public class X_HR_Payroll extends PO implements I_HR_Payroll, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_PayrollConcept.java b/org.adempiere.base/src/org/eevolution/model/X_HR_PayrollConcept.java
index 8459f98fac..2a0d006bf4 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_PayrollConcept.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_PayrollConcept.java
@@ -19,14 +19,12 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_PayrollConcept
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_PayrollConcept")
 public class X_HR_PayrollConcept extends PO implements I_HR_PayrollConcept, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Period.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Period.java
index 0fa7b647be..edb5fbd899 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Period.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Period.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for HR_Period
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_Period")
 public class X_HR_Period extends PO implements I_HR_Period, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Process.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Process.java
index 9648bf500c..c94cf4fafd 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Process.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Process.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -29,7 +28,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for HR_Process
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_Process")
 public class X_HR_Process extends PO implements I_HR_Process, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_HR_Year.java b/org.adempiere.base/src/org/eevolution/model/X_HR_Year.java
index 60f0dacb8b..b1bf9cab3b 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_HR_Year.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_HR_Year.java
@@ -20,13 +20,11 @@ package org.eevolution.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 
 /** Generated Model for HR_Year
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="HR_Year")
 public class X_HR_Year extends PO implements I_HR_Year, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_I_HR_Movement.java b/org.adempiere.base/src/org/eevolution/model/X_I_HR_Movement.java
index 7ffef2e990..f3913b8022 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_I_HR_Movement.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_I_HR_Movement.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -29,7 +28,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for I_HR_Movement
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_HR_Movement")
 public class X_I_HR_Movement extends PO implements I_I_HR_Movement, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_I_Movement.java b/org.adempiere.base/src/org/eevolution/model/X_I_Movement.java
index 83e52a7437..13025dae9b 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_I_Movement.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_I_Movement.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 
 /** Generated Model for I_Movement
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_Movement")
 public class X_I_Movement extends PO implements I_I_Movement, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_I_ProductPlanning.java b/org.adempiere.base/src/org/eevolution/model/X_I_ProductPlanning.java
index af2069abf2..bb97874265 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_I_ProductPlanning.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_I_ProductPlanning.java
@@ -21,14 +21,12 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 
 /** Generated Model for I_ProductPlanning
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="I_ProductPlanning")
 public class X_I_ProductPlanning extends PO implements I_I_ProductPlanning, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_Collector.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_Collector.java
index ab4ce23f82..7545b2ac30 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_Collector.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_Collector.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -29,7 +28,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for PP_Cost_Collector
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Cost_Collector")
 public class X_PP_Cost_Collector extends PO implements I_PP_Cost_Collector, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_CollectorMA.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_CollectorMA.java
index 71fd9f21ac..0ba7d9f3d5 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_CollectorMA.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Cost_CollectorMA.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 
 /** Generated Model for PP_Cost_CollectorMA
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Cost_CollectorMA")
 public class X_PP_Cost_CollectorMA extends PO implements I_PP_Cost_CollectorMA, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_MRP.java b/org.adempiere.base/src/org/eevolution/model/X_PP_MRP.java
index de0432a1bf..482739170e 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_MRP.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_MRP.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -29,7 +28,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for PP_MRP
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_MRP")
 public class X_PP_MRP extends PO implements I_PP_MRP, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order.java
index b9dbc5a65a..8c39ca02a4 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -29,7 +28,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for PP_Order
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Order")
 public class X_PP_Order extends PO implements I_PP_Order, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOM.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOM.java
index b3fff22ba9..a8a9c32f1b 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOM.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOM.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PP_Order_BOM
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Order_BOM")
 public class X_PP_Order_BOM extends PO implements I_PP_Order_BOM, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOMLine.java
index b0b6962823..74b2b61389 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOMLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_BOMLine.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -29,7 +28,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for PP_Order_BOMLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Order_BOMLine")
 public class X_PP_Order_BOMLine extends PO implements I_PP_Order_BOMLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Cost.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Cost.java
index 9640db7da3..2c1cfbb509 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Cost.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Cost.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 
 /** Generated Model for PP_Order_Cost
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Order_Cost")
 public class X_PP_Order_Cost extends PO implements I_PP_Order_Cost, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node.java
index 1d9f2ed5bc..0ef6a13d8a 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -29,7 +28,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for PP_Order_Node
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Order_Node")
 public class X_PP_Order_Node extends PO implements I_PP_Order_Node, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_NodeNext.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_NodeNext.java
index f20bab5f76..deea1c0ef4 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_NodeNext.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_NodeNext.java
@@ -19,13 +19,11 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 
 /** Generated Model for PP_Order_NodeNext
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Order_NodeNext")
 public class X_PP_Order_NodeNext extends PO implements I_PP_Order_NodeNext, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Asset.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Asset.java
index c7d85ceadc..4e8866d10c 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Asset.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Asset.java
@@ -19,13 +19,11 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 
 /** Generated Model for PP_Order_Node_Asset
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Order_Node_Asset")
 public class X_PP_Order_Node_Asset extends PO implements I_PP_Order_Node_Asset, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Product.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Product.java
index 63af1de3f1..96ed59297e 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Product.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Node_Product.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 
 /** Generated Model for PP_Order_Node_Product
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Order_Node_Product")
 public class X_PP_Order_Node_Product extends PO implements I_PP_Order_Node_Product, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Workflow.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Workflow.java
index c712c4aa99..3d4a4ba45c 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Workflow.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Order_Workflow.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -29,7 +28,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for PP_Order_Workflow
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Order_Workflow")
 public class X_PP_Order_Workflow extends PO implements I_PP_Order_Workflow, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOM.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOM.java
index 7de434068c..333f3a4ce2 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOM.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOM.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.KeyNamePair;
 
 /** Generated Model for PP_Product_BOM
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Product_BOM")
 public class X_PP_Product_BOM extends PO implements I_PP_Product_BOM, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOMLine.java
index 65c300cc39..994ac2d0f2 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOMLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_BOMLine.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -29,7 +28,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for PP_Product_BOMLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Product_BOMLine")
 public class X_PP_Product_BOMLine extends PO implements I_PP_Product_BOMLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_Product_Planning.java b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_Planning.java
index ece28e6091..9f76f6eded 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_Product_Planning.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_Product_Planning.java
@@ -20,7 +20,6 @@ package org.eevolution.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -28,7 +27,6 @@ import org.compiere.util.KeyNamePair;
 /** Generated Model for PP_Product_Planning
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_Product_Planning")
 public class X_PP_Product_Planning extends PO implements I_PP_Product_Planning, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Asset.java b/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Asset.java
index f0530db33f..4d347ae896 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Asset.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Asset.java
@@ -19,13 +19,11 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 
 /** Generated Model for PP_WF_Node_Asset
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_WF_Node_Asset")
 public class X_PP_WF_Node_Asset extends PO implements I_PP_WF_Node_Asset, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Product.java b/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Product.java
index ce697ac8f4..9f11a98519 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Product.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_PP_WF_Node_Product.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 
 /** Generated Model for PP_WF_Node_Product
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="PP_WF_Node_Product")
 public class X_PP_WF_Node_Product extends PO implements I_PP_WF_Node_Product, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_QM_Specification.java b/org.adempiere.base/src/org/eevolution/model/X_QM_Specification.java
index d87316a779..25a07e9256 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_QM_Specification.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_QM_Specification.java
@@ -20,13 +20,11 @@ package org.eevolution.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 
 /** Generated Model for QM_Specification
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="QM_Specification")
 public class X_QM_Specification extends PO implements I_QM_Specification, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_QM_SpecificationLine.java b/org.adempiere.base/src/org/eevolution/model/X_QM_SpecificationLine.java
index 6ae10af03f..9ea0eefc13 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_QM_SpecificationLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_QM_SpecificationLine.java
@@ -20,13 +20,11 @@ package org.eevolution.model;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 
 /** Generated Model for QM_SpecificationLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="QM_SpecificationLine")
 public class X_QM_SpecificationLine extends PO implements I_QM_SpecificationLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_T_BOMLine.java b/org.adempiere.base/src/org/eevolution/model/X_T_BOMLine.java
index acb2e1073c..5b3a814647 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_T_BOMLine.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_T_BOMLine.java
@@ -20,14 +20,12 @@ package org.eevolution.model;
 import java.math.BigDecimal;
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 import org.compiere.util.Env;
 
 /** Generated Model for T_BOMLine
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_BOMLine")
 public class X_T_BOMLine extends PO implements I_T_BOMLine, I_Persistent 
 {
diff --git a/org.adempiere.base/src/org/eevolution/model/X_T_MRP_CRP.java b/org.adempiere.base/src/org/eevolution/model/X_T_MRP_CRP.java
index 51b4432424..e6862b9f5f 100644
--- a/org.adempiere.base/src/org/eevolution/model/X_T_MRP_CRP.java
+++ b/org.adempiere.base/src/org/eevolution/model/X_T_MRP_CRP.java
@@ -19,13 +19,11 @@ package org.eevolution.model;
 
 import java.sql.ResultSet;
 import java.util.Properties;
-import org.atteo.classindex.IndexSubclasses;
 import org.compiere.model.*;
 
 /** Generated Model for T_MRP_CRP
  *  @author iDempiere (generated) 
  *  @version Development 9.0 - $Id$ */
-@IndexSubclasses
 @org.adempiere.base.Model(table="T_MRP_CRP")
 public class X_T_MRP_CRP extends PO implements I_T_MRP_CRP, I_Persistent 
 {
diff --git a/org.idempiere.test/META-INF/MANIFEST.MF b/org.idempiere.test/META-INF/MANIFEST.MF
index 1dd9a4574a..2d60309cb8 100644
--- a/org.idempiere.test/META-INF/MANIFEST.MF
+++ b/org.idempiere.test/META-INF/MANIFEST.MF
@@ -19,7 +19,10 @@ Import-Package: org.junit.jupiter.api;version="5.6.0",
  org.junit.jupiter.params.support;version="5.6.0",
  org.osgi.framework;version="1.9.0",
  org.osgi.service.component.annotations;version="1.3.0",
- org.osgi.service.event;version="1.4.0"
+ org.osgi.service.event;version="1.4.0",
+ org.springframework.beans.factory.config;version="5.2.15.RELEASE",
+ org.springframework.context.annotation;version="5.2.15.RELEASE",
+ org.springframework.core.type.filter;version="5.2.15.RELEASE"
 Require-Bundle: org.adempiere.base;bundle-version="9.0.0",
  org.adempiere.base.callout;bundle-version="9.0.0",
  org.adempiere.base.process;bundle-version="9.0.0",
@@ -30,3 +33,4 @@ Bundle-Activator: org.idempiere.test.TestActivator
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.idempiere.test
 Service-Component: OSGI-INF/org.idempiere.test.event.MyComponent.xml
+Bundle-ClassPath: .
diff --git a/org.idempiere.test/src/org/idempiere/test/model/ModelClassMappingTest.java b/org.idempiere.test/src/org/idempiere/test/model/ModelClassMappingTest.java
new file mode 100644
index 0000000000..f9b52ce0db
--- /dev/null
+++ b/org.idempiere.test/src/org/idempiere/test/model/ModelClassMappingTest.java
@@ -0,0 +1,109 @@
+/***********************************************************************
+ * This file is part of iDempiere ERP Open Source                      *
+ * http://www.idempiere.org                                            *
+ *                                                                     *
+ * Copyright (C) Contributors                                          *
+ *                                                                     *
+ * This program is free software; you can redistribute it and/or       *
+ * modify it under the terms of the GNU General Public License         *
+ * as published by the Free Software Foundation; either version 2      *
+ * of the License, or (at your option) any later version.              *
+ *                                                                     *
+ * This program is distributed in the hope that it will be useful,     *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        *
+ * GNU General Public License for more details.                        *
+ *                                                                     *
+ * You should have received a copy of the GNU General Public License   *
+ * along with this program; if not, write to the Free Software         *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,          *
+ * MA 02110-1301, USA.                                                 *
+ *                                                                     *
+ * Contributors:                                                       *
+ * - hengsin                         								   *
+ **********************************************************************/
+package org.idempiere.test.model;
+
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.List;
+import java.util.Set;
+
+import org.adempiere.base.IModelFactory;
+import org.adempiere.base.IServiceReferenceHolder;
+import org.adempiere.base.Service;
+import org.adempiere.model.GenericPO;
+import org.compiere.model.MTable;
+import org.compiere.model.Query;
+import org.compiere.util.Env;
+import org.idempiere.test.AbstractTestCase;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
+import org.springframework.core.type.filter.AssignableTypeFilter;
+
+/**
+ * @author hengsin
+ *
+ */
+public class ModelClassMappingTest extends AbstractTestCase {
+
+	//copy from DefaultModelFactory
+	/**	Packages for Model Classes	*/
+	private static final String[]	s_packages = new String[] {
+		"org.compiere.model", "org.compiere.wf",
+		"org.compiere.print", "org.compiere.impexp",
+		"compiere.model",			//	globalqss allow compatibility with other plugins
+		"adempiere.model",			//	Extensions
+		"org.adempiere.model"
+	};
+
+	
+	/**
+	 * default constructor
+	 */
+	public ModelClassMappingTest() {
+	}
+
+	@Test
+	public void testModelClassMappingForCoreTables() {
+		Query query = new Query(Env.getCtx(), MTable.Table_Name, "IsView='N' AND EntityType IN ('D','EE01','EE02','EE04','EE05') "
+				+ "AND TableName NOT Like 'I\\_%' AND TableName NOT Like 'T\\_%' AND TableName NOT Like 'W\\_%'"
+				+ "AND TableName NOT Like '%\\_Trl'", getTrxName());
+		List<IServiceReferenceHolder<IModelFactory>> references = Service.locator().list(IModelFactory.class).getServiceReferences();
+		List<MTable> tables = query.setOnlyActiveRecords(true).setOrderBy("TableName").list();
+		for(MTable table : tables) {
+			Class<?> clazz = null;
+			for(IServiceReferenceHolder<IModelFactory> reference : references) {
+				IModelFactory service = reference.getService();
+				if (service != null) {
+					clazz = service.getClass(table.getTableName());
+					if (clazz != null) {
+						break;
+					}
+				}
+			}
+			assertNotNull(clazz, "No model class found for TableName="+table.getTableName());
+			assertNotEquals(clazz.getSimpleName(), GenericPO.class.getSimpleName(), "GenericPO class is use for TableName="+table.getTableName());
+			
+			ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false);		
+			if (clazz.getSimpleName().startsWith("X_")) {
+				provider.addIncludeFilter(new AssignableTypeFilter(clazz));
+				for(String p : s_packages) {
+					Set<BeanDefinition> beans = provider.findCandidateComponents(p);
+					if (beans != null && beans.size() > 0) {
+						for (BeanDefinition bean : beans) {
+							if (!bean.getBeanClassName().equals(clazz.getName()))
+								fail("Using " + clazz.getName() + " for table " + table.getTableName() + " instead of " + bean.getBeanClassName());
+						}
+					}
+				}
+			}
+			
+			//uncomment to see all mappings at console
+			//System.out.println(table.getTableName()+"="+clazz.getName());
+		}
+	}
+}