diff --git a/hibernate-core/src/main/java/org/hibernate/internal/jaxb/mapping/hbm/QuerySourceElement.java b/hibernate-core/src/main/java/org/hibernate/internal/jaxb/mapping/hbm/QuerySourceElement.java
new file mode 100644
index 0000000000..4e436d23b3
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/internal/jaxb/mapping/hbm/QuerySourceElement.java
@@ -0,0 +1,44 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, 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.internal.jaxb.mapping.hbm;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Strong Liu <stliu@hibernate.org>
+ */
+public interface QuerySourceElement {
+
+	public List<Serializable> getContent();
+	public JaxbCacheModeAttribute getCacheMode();
+	public String getCacheRegion();
+	public boolean isCacheable();
+	public String getComment();
+	public Integer getFetchSize();
+	public JaxbFlushModeAttribute getFlushMode();
+	public String getName();
+	public boolean isReadOnly();
+	public Integer getTimeout();
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/jaxb/mapping/hbm/ReturnElement.java b/hibernate-core/src/main/java/org/hibernate/internal/jaxb/mapping/hbm/ReturnElement.java
new file mode 100644
index 0000000000..721c1b5edb
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/internal/jaxb/mapping/hbm/ReturnElement.java
@@ -0,0 +1,35 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2012, 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.internal.jaxb.mapping.hbm;
+
+import java.util.List;
+
+/**
+ * @author Strong Liu <stliu@hibernate.org>
+ */
+public interface ReturnElement {
+	public String getAlias();
+	public JaxbLockModeAttribute getLockMode();
+	public List<JaxbReturnPropertyElement> getReturnProperty();
+}