Index: /home/andy/work/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
===================================================================
--- /home/andy/work/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo	(revision 560272)
+++ /home/andy/work/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo	(working copy)
@@ -128,7 +128,7 @@
                    field-type="org.apache.jdo.tck.pc.company.PIAddress"
                    persistence-modifier="persistent"/>
             <property name="departments" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IDepartment"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIDepartment"/>
             </property>
         </interface>
 
@@ -137,11 +137,14 @@
 
         <interface name="PIDepartment"
             identity-type="datastore">
+            <property name="company"
+                   field-type="org.apache.jdo.tck.pc.company.PICompany"
+                   persistence-modifier="persistent"/>
             <property name="employees" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIEmployee"/>
             </property>
             <property name="fundedEmps" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIEmployee"/>
             </property>
         </interface>
 
@@ -147,6 +150,30 @@
 
         <interface name="PIEmployee"
             identity-type="datastore">
+            <property name="dentalInsurance"
+                   field-type="org.apache.jdo.tck.pc.company.PIDentalInsurance"
+                   persistence-modifier="persistent"/>
+            <property name="medicalInsurance"
+                   field-type="org.apache.jdo.tck.pc.company.PIMedicalInsurance"
+                   persistence-modifier="persistent"/>
+            <property name="department"
+                   field-type="org.apache.jdo.tck.pc.company.PIDepartment"
+                   persistence-modifier="persistent"/>
+            <property name="fundingDept"
+                   field-type="org.apache.jdo.tck.pc.company.PIDepartment"
+                   persistence-modifier="persistent"/>
+            <property name="manager"
+                   field-type="org.apache.jdo.tck.pc.company.PIEmployee"
+                   persistence-modifier="persistent"/>
+            <property name="mentor"
+                   field-type="org.apache.jdo.tck.pc.company.PIEmployee"
+                   persistence-modifier="persistent"/>
+            <property name="protege"
+                   field-type="org.apache.jdo.tck.pc.company.PIEmployee"
+                   persistence-modifier="persistent"/>
+            <property name="hradvisor"
+                   field-type="org.apache.jdo.tck.pc.company.PIEmployee"
+                   persistence-modifier="persistent"/>
             <property name="reviewedProjects" persistence-modifier="persistent">
                 <collection element-type="org.apache.jdo.tck.pc.company.PIProject"/>
             </property>
@@ -154,10 +181,10 @@
                 <collection element-type="org.apache.jdo.tck.pc.company.PIProject"/>
             </property>
             <property name="team" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIEmployee"/>
             </property>
             <property name="hradvisees" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIEmployee"/>
             </property>
         </interface>
 
@@ -166,6 +193,7 @@
 
         <interface name="PIInsurance"
             identity-type="datastore">
+            <property name="employee" field-type="org.apache.jdo.tck.pc.company.PIEmployee" persistence-modifier="persistent"/>
         </interface>
 
         <interface name="PIMedicalInsurance"
@@ -218,10 +246,10 @@
         <interface name="PIProject"
             identity-type="datastore">
             <property name="reviewers" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIEmployee"/>
             </property>
             <property name="members" persistence-modifier="persistent">
-                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+                <collection element-type="org.apache.jdo.tck.pc.company.PIEmployee"/>
             </property>
         </interface>