diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index f8f1c73c7..ad28e75bd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -545,6 +545,13 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     return importedId;
   }
 
+  /**
+   * Find and return a matching imported id property.
+   */
+  public BeanProperty findMatchImport(String dbCol) {
+    return importedId.findMatchImport(dbCol);
+  }
+
   private String deriveWhereParentIdSql(boolean inClause) {
     StringBuilder sb = new StringBuilder();
     for (int i = 0; i < exportedProperties.length; i++) {
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
index bb188442e..0a9f29eca 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java
@@ -2,28 +2,11 @@ package io.ebeaninternal.dbmigration.model.build;
 
 import io.ebean.annotation.Platform;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.IndexSet;
-import io.ebeaninternal.dbmigration.model.MColumn;
-import io.ebeaninternal.dbmigration.model.MCompoundForeignKey;
-import io.ebeaninternal.dbmigration.model.MCompoundUniqueConstraint;
-import io.ebeaninternal.dbmigration.model.MIndex;
-import io.ebeaninternal.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.model.*;
+import io.ebeaninternal.server.deploy.*;
 import io.ebeaninternal.server.deploy.visitor.BaseTablePropertyVisitor;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
-import io.ebeaninternal.server.deploy.IndexDefinition;
-import io.ebeaninternal.server.deploy.InheritInfo;
-import io.ebeaninternal.server.deploy.PropertyForeignKey;
-import io.ebeaninternal.server.deploy.TableJoin;
-import io.ebeaninternal.server.deploy.TableJoinColumn;
-import io.ebeaninternal.server.deploy.id.ImportedId;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-import java.util.StringJoiner;
+import java.util.*;
 
 /**
  * Used as part of ModelBuildBeanVisitor and generally adds the MColumn to the associated
@@ -192,8 +175,6 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
       throw new RuntimeException("No join columns for " + p.fullName());
     }
 
-    ImportedId importedId = p.importedId();
-
     List<MColumn> modelColumns = new ArrayList<>(columns.length);
 
     MCompoundForeignKey compoundKey = null;
@@ -209,7 +190,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
     for (TableJoinColumn column : columns) {
 
       String dbCol = column.getLocalDbColumn();
-      BeanProperty importedProperty = importedId.findMatchImport(dbCol);
+      BeanProperty importedProperty = p.findMatchImport(dbCol);
       if (importedProperty == null) {
         throw new RuntimeException("Imported BeanProperty not found?");
       }