diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/CollectionJoinableAssociationImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/CollectionJoinableAssociationImpl.java
new file mode 100644
index 0000000000..254c1a9c33
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/loader/internal/CollectionJoinableAssociationImpl.java
@@ -0,0 +1,93 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2013, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.loader.internal;
+
+import java.util.Map;
+
+import org.hibernate.Filter;
+import org.hibernate.MappingException;
+import org.hibernate.loader.plan.spi.CollectionFetch;
+import org.hibernate.loader.plan.spi.EntityReference;
+import org.hibernate.loader.spi.JoinableAssociation;
+import org.hibernate.persister.collection.QueryableCollection;
+import org.hibernate.persister.entity.Joinable;
+import org.hibernate.type.AssociationType;
+
+/**
+ * This class represents a joinable collection association.
+ *
+ * @author Gail Badner
+ */
+
+public class CollectionJoinableAssociationImpl extends AbstractJoinableAssociationImpl {
+
+	private final AssociationType joinableType;
+	private final Joinable joinable;
+
+	public CollectionJoinableAssociationImpl(
+			CollectionFetch collectionFetch,
+			EntityReference currentEntityReference,
+			String withClause,
+			boolean hasRestriction,
+			Map<String, Filter> enabledFilters) throws MappingException {
+		super(
+				collectionFetch,
+				currentEntityReference,
+				collectionFetch,
+				withClause,
+				hasRestriction,
+				enabledFilters
+		);
+		this.joinableType = collectionFetch.getCollectionPersister().getCollectionType();
+		this.joinable = (Joinable) collectionFetch.getCollectionPersister();
+	}
+
+	@Override
+	public AssociationType getAssociationType() {
+		return joinableType;
+	}
+
+	@Override
+	public Joinable getJoinable() {
+		return joinable;
+	}
+
+	@Override
+	public boolean isCollection() {
+		return true;
+	}
+
+	@Override
+	public boolean isManyToManyWith(JoinableAssociation other) {
+		QueryableCollection persister = ( QueryableCollection ) joinable;
+		if ( persister.isManyToMany() ) {
+			return persister.getElementType() == other.getAssociationType();
+		}
+		return false;
+	}
+
+	protected boolean isOneToOne() {
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/internal/EntityJoinableAssociationImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/internal/EntityJoinableAssociationImpl.java
new file mode 100644
index 0000000000..34d22b56ba
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/loader/internal/EntityJoinableAssociationImpl.java
@@ -0,0 +1,89 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2013, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * 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 Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.loader.internal;
+
+import java.util.Map;
+
+import org.hibernate.Filter;
+import org.hibernate.MappingException;
+import org.hibernate.loader.plan.spi.CollectionReference;
+import org.hibernate.loader.plan.spi.EntityFetch;
+import org.hibernate.loader.spi.JoinableAssociation;
+import org.hibernate.persister.entity.Joinable;
+import org.hibernate.type.AssociationType;
+import org.hibernate.type.EntityType;
+
+/**
+ * This class represents a joinable entity association.
+ *
+ * @author Gavin King
+ */
+public class EntityJoinableAssociationImpl extends AbstractJoinableAssociationImpl {
+
+	private final AssociationType joinableType;
+	private final Joinable joinable;
+
+	public EntityJoinableAssociationImpl(
+			EntityFetch entityFetch,
+			CollectionReference currentCollectionReference,
+			String withClause,
+			boolean hasRestriction,
+			Map<String, Filter> enabledFilters) throws MappingException {
+		super(
+				entityFetch,
+				entityFetch,
+				currentCollectionReference,
+				withClause,
+				hasRestriction,
+				enabledFilters
+		);
+		this.joinableType = entityFetch.getAssociationType();
+		this.joinable = (Joinable) entityFetch.getEntityPersister();
+	}
+
+	@Override
+	public AssociationType getAssociationType() {
+		return joinableType;
+	}
+
+	@Override
+	public Joinable getJoinable() {
+		return joinable;
+	}
+
+	@Override
+	public boolean isCollection() {
+		return false;
+	}
+
+	@Override
+	public boolean isManyToManyWith(JoinableAssociation other) {
+		return false;
+	}
+
+	protected boolean isOneToOne() {
+		EntityType entityType = (EntityType) joinableType;
+		return entityType.isOneToOne() /*&& entityType.isReferenceToPrimaryKey()*/;
+	}
+}
\ No newline at end of file