diff --git a/lib/Doctrine/Resource/Client.php b/lib/Doctrine/Resource/Client.php
index c2ce7de16..e76fde4cd 100644
--- a/lib/Doctrine/Resource/Client.php
+++ b/lib/Doctrine/Resource/Client.php
@@ -82,7 +82,7 @@ class Doctrine_Resource_Client extends Doctrine_Resource
             $import = new Doctrine_Import_Schema();
             $schema = $import->buildSchema($path, $this->getConfig()->get('format'));
             
-            if (file_exists($classesPath)) {
+            if (!file_exists($classesPath)) {
                 $build = "<?php\n";
                 foreach ($schema['schema'] as $className => $details) {
                     $build .= "class " . $className . " extends Doctrine_Resource_Record { protected \$_model = '".$className."'; public function __construct(\$loadRelations = true) { parent::__construct(\$this->_model, \$loadRelations); } }\n";
diff --git a/lib/Doctrine/Resource/Table.php b/lib/Doctrine/Resource/Table.php
index 5d9380e7a..4f4775735 100644
--- a/lib/Doctrine/Resource/Table.php
+++ b/lib/Doctrine/Resource/Table.php
@@ -48,7 +48,6 @@ class Doctrine_Resource_Table
         
         if (isset($schema['relations'][$model]) && $schema['relations'][$model]) {
             $this->_schema['relations'] = $schema['relations'][$model];
-            $this->_schema['schema']['relations'] = $this->_schema['relations'];
         }
     }
     
diff --git a/playground/index.php b/playground/index.php
index 7f2629661..f594357d3 100644
--- a/playground/index.php
+++ b/playground/index.php
@@ -16,15 +16,17 @@ if ($action == 'server') {
     
 } else {
     $url = 'http://localhost/~jwage/doctrine_trunk/playground/index.php?action=server';
-    $config = array();
+    $config = array('format' => 'yml');
     
     // Instantiate a new client
     $client = Doctrine_Resource_Client::getInstance($url, $config);
     
+    /*
     $query = new Doctrine_Resource_Query();
     $users = $query->from('User u, u.Group g')->execute();
     
     print_r($users->toArray(true));
+    */
     
     /*
     $group = new Group();
diff --git a/tests/schema.xml b/tests/schema.xml
index 8c1c1cb21..b55374623 100755
--- a/tests/schema.xml
+++ b/tests/schema.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data><Account><tableName>account</tableName><className>Account</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><entity_id><type>integer</type><length>2147483647</length><name>entity_id</name></entity_id><amount><type>integer</type><length>2147483647</length><name>amount</name></amount></columns></Account><Address><tableName>address</tableName><className>Address</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><address><type>string</type><length>200</length><name>address</name></address></columns><relations><User><refClass>EntityAddress</refClass><local>address_id</local><foreign>user_id</foreign><type>many</type></User><EntityAddress><local>id</local><foreign>address_id</foreign><type>many</type></EntityAddress></relations></Address><Album><tableName>album</tableName><className>Album</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><user_id><type>integer</type><length>2147483647</length><name>user_id</name></user_id><name><type>string</type><length>20</length><name>name</name></name></columns><relations><Song><local>id</local><foreign>album_id</foreign><type>many</type></Song><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></Album><Assignment><tableName>assignment</tableName><className>Assignment</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><task_id><type>integer</type><length>2147483647</length><name>task_id</name></task_id><resource_id><type>integer</type><length>2147483647</length><name>resource_id</name></resource_id></columns><relations><Resource><local>resource_id</local><foreign>id</foreign><type>one</type></Resource><Task><local>task_id</local><foreign>id</foreign><type>one</type></Task></relations></Assignment><Description><tableName>description</tableName><className>Description</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><description><type>string</type><length>3000</length><name>description</name></description><file_md5><type>string</type><length>32</length><name>file_md5</name></file_md5></columns></Description><Element><tableName>element</tableName><className>Element</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name><parent_id><type>integer</type><length>2147483647</length><name>parent_id</name></parent_id></columns><relations><Child><class>Element</class><local>id</local><foreign>parent_id</foreign><type>many</type></Child><Parent><class>Element</class><local>parent_id</local><foreign>id</foreign><type>one</type></Parent></relations></Element><Email><tableName>email</tableName><className>Email</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><address><email>1</email><unique>1</unique><type>string</type><length>150</length><name>address</name></address></columns></Email><Entity><tableName>entity</tableName><className>Entity</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference></relations></Entity><EntityAddress><tableName>entity_address</tableName><className>EntityAddress</className><columns><user_id><primary>1</primary><type>integer</type><length>2147483647</length><name>user_id</name></user_id><address_id><primary>1</primary><type>integer</type><length>2147483647</length><name>address_id</name></address_id></columns><relations><Address><local>address_id</local><foreign>id</foreign><type>one</type></Address><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></EntityAddress><EntityReference><tableName>entity_reference</tableName><className>EntityReference</className><columns><entity1><primary>1</primary><type>integer</type><length>2147483647</length><name>entity1</name></entity1><entity2><primary>1</primary><type>integer</type><length>2147483647</length><name>entity2</name></entity2></columns><relations><Entity><local>entity1</local><foreign>id</foreign><type>one</type></Entity><Group><local>entity1</local><foreign>id</foreign><type>one</type></Group><User><local>entity1</local><foreign>id</foreign><type>one</type></User></relations></EntityReference><Error><tableName>error</tableName><className>Error</className><columns><message><type>string</type><length>200</length><name>message</name></message><code><type>integer</type><length>11</length><name>code</name></code><file_md5><primary>1</primary><type>string</type><length>32</length><name>file_md5</name></file_md5></columns><relations><Description><local>file_md5</local><foreign>file_md5</foreign><type>one</type></Description></relations></Error><Group><tableName>entity</tableName><className>Group</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><User><refClass>Groupuser</refClass><local>group_id</local><foreign>user_id</foreign><type>many</type></User><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference><Groupuser><local>id</local><foreign>group_id</foreign><type>many</type></Groupuser></relations></Group><Groupuser><tableName>groupuser</tableName><className>Groupuser</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><added><type>integer</type><length>2147483647</length><name>added</name></added><group_id><type>integer</type><length>2147483647</length><name>group_id</name></group_id><user_id><type>integer</type><length>2147483647</length><name>user_id</name></user_id></columns><relations><Group><local>group_id</local><foreign>id</foreign><type>one</type></Group><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></Groupuser><Phonenumber><tableName>phonenumber</tableName><className>Phonenumber</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><phonenumber><type>string</type><length>20</length><name>phonenumber</name></phonenumber><entity_id><type>integer</type><length>2147483647</length><name>entity_id</name></entity_id></columns><relations><Entity><local>entity_id</local><foreign>id</foreign><type>one</type></Entity><Group><local>entity_id</local><foreign>id</foreign><type>one</type></Group><User><local>entity_id</local><foreign>id</foreign><type>one</type></User></relations></Phonenumber><ResourceReference><tableName>resource_reference</tableName><className>ResourceReference</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><type_id><type>integer</type><length>2147483647</length><name>type_id</name></type_id><resource_id><type>integer</type><length>2147483647</length><name>resource_id</name></resource_id></columns><relations><Resource><local>resource_id</local><foreign>id</foreign><type>one</type></Resource><ResourceType><local>resourcetype_id</local><foreign>id</foreign><type>one</type></ResourceType></relations></ResourceReference><Resource><tableName>resource</tableName><className>Resource</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name></columns><relations><TaskAlias><refClass>Assignment</refClass><class>Task</class><local>resource_id</local><foreign>task_id</foreign><type>many</type></TaskAlias><Type><refClass>ResourceReference</refClass><class>ResourceType</class><local>resource_id</local><foreign>type_id</foreign><type>many</type></Type><Assignment><local>id</local><foreign>resource_id</foreign><type>many</type></Assignment><ResourceReference><local>id</local><foreign>resource_id</foreign><type>many</type></ResourceReference></relations></Resource><ResourceType><tableName>resource_type</tableName><className>ResourceType</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><type><type>string</type><length>100</length><name>type</name></type></columns><relations><ResourceAlias><refClass>ResourceReference</refClass><class>Resource</class><local>resourcetype_id</local><foreign>resource_id</foreign><type>many</type></ResourceAlias><ResourceReference><local>id</local><foreign>resourcetype_id</foreign><type>many</type></ResourceReference></relations></ResourceType><Song><tableName>song</tableName><className>Song</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><album_id><type>integer</type><length>2147483647</length><name>album_id</name></album_id><genre><type>string</type><length>20</length><name>genre</name></genre><title><type>string</type><length>30</length><name>title</name></title></columns><relations><Album><local>album_id</local><foreign>id</foreign><type>one</type></Album></relations></Song><Task><tableName>task</tableName><className>Task</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name><parent_id><type>integer</type><length>2147483647</length><name>parent_id</name></parent_id></columns><relations><ResourceAlias><refClass>Assignment</refClass><class>Resource</class><local>task_id</local><foreign>resource_id</foreign><type>many</type></ResourceAlias><Subtask><class>Task</class><local>id</local><foreign>parent_id</foreign><type>many</type></Subtask><Assignment><local>id</local><foreign>task_id</foreign><type>many</type></Assignment></relations></Task><User><tableName>entity</tableName><className>User</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><Address><refClass>EntityAddress</refClass><local>user_id</local><foreign>address_id</foreign><type>many</type></Address><Album><local>id</local><foreign>user_id</foreign><type>many</type></Album><Book><local>id</local><foreign>user_id</foreign><type>many</type></Book><Group><refClass>Groupuser</refClass><local>user_id</local><foreign>group_id</foreign><type>many</type></Group><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference><EntityAddress><local>id</local><foreign>user_id</foreign><type>many</type></EntityAddress><Groupuser><local>id</local><foreign>user_id</foreign><type>many</type></Groupuser></relations></User></data>
+<data><Account><tableName>account</tableName><className>Account</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><entity_id><type>integer</type><length>2147483647</length><name>entity_id</name></entity_id><amount><type>integer</type><length>2147483647</length><name>amount</name></amount></columns></Account><Address><tableName>address</tableName><className>Address</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><address><type>string</type><length>200</length><name>address</name></address></columns><relations><User><refClass>EntityAddress</refClass><local>address_id</local><foreign>user_id</foreign><type>many</type></User><EntityAddress><local>id</local><foreign>address_id</foreign><type>many</type></EntityAddress></relations></Address><Album><tableName>album</tableName><className>Album</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><user_id><type>integer</type><length>2147483647</length><name>user_id</name></user_id><name><type>string</type><length>20</length><name>name</name></name></columns><relations><Song><local>id</local><foreign>album_id</foreign><type>many</type></Song><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></Album><Assignment><tableName>assignment</tableName><className>Assignment</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><task_id><type>integer</type><length>2147483647</length><name>task_id</name></task_id><resource_id><type>integer</type><length>2147483647</length><name>resource_id</name></resource_id></columns><relations><Resource><local>resource_id</local><foreign>id</foreign><type>one</type></Resource><Task><local>task_id</local><foreign>id</foreign><type>one</type></Task></relations></Assignment><Description><tableName>description</tableName><className>Description</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><description><type>string</type><length>3000</length><name>description</name></description><file_md5><type>string</type><length>32</length><name>file_md5</name></file_md5></columns></Description><Element><tableName>element</tableName><className>Element</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name><parent_id><type>integer</type><length>2147483647</length><name>parent_id</name></parent_id></columns><relations><Child><class>Element</class><local>id</local><foreign>parent_id</foreign><type>many</type></Child><Parent><class>Element</class><local>parent_id</local><foreign>id</foreign><type>one</type></Parent></relations></Element><Email><tableName>email</tableName><className>Email</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><address><email>1</email><unique>1</unique><type>string</type><length>150</length><name>address</name></address></columns></Email><Entity><tableName>entity</tableName><className>Entity</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference></relations></Entity><EntityAddress><tableName>entity_address</tableName><className>EntityAddress</className><columns><user_id><primary>1</primary><type>integer</type><length>2147483647</length><name>user_id</name></user_id><address_id><primary>1</primary><type>integer</type><length>2147483647</length><name>address_id</name></address_id></columns><relations><Address><local>address_id</local><foreign>id</foreign><type>one</type></Address><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></EntityAddress><EntityReference><tableName>entity_reference</tableName><className>EntityReference</className><columns><entity1><primary>1</primary><type>integer</type><length>2147483647</length><name>entity1</name></entity1><entity2><primary>1</primary><type>integer</type><length>2147483647</length><name>entity2</name></entity2></columns><relations><Entity><local>entity1</local><foreign>id</foreign><type>one</type></Entity><Group><local>entity1</local><foreign>id</foreign><type>one</type></Group><User><local>entity1</local><foreign>id</foreign><type>one</type></User></relations></EntityReference><Error><tableName>error</tableName><className>Error</className><columns><message><type>string</type><length>200</length><name>message</name></message><code><type>integer</type><length>11</length><name>code</name></code><file_md5><primary>1</primary><type>string</type><length>32</length><name>file_md5</name></file_md5></columns><relations><Description><local>file_md5</local><foreign>file_md5</foreign><type>one</type></Description></relations></Error><Group><tableName>entity</tableName><className>Group</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><User><refClass>Groupuser</refClass><local>group_id</local><foreign>user_id</foreign><type>many</type></User><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference><Groupuser><local>id</local><foreign>group_id</foreign><type>many</type></Groupuser></relations></Group><Groupuser><tableName>groupuser</tableName><className>Groupuser</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><added><type>integer</type><length>2147483647</length><name>added</name></added><group_id><type>integer</type><length>2147483647</length><name>group_id</name></group_id><user_id><type>integer</type><length>2147483647</length><name>user_id</name></user_id></columns><relations><Group><local>group_id</local><foreign>id</foreign><type>one</type></Group><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></Groupuser><Phonenumber><tableName>phonenumber</tableName><className>Phonenumber</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><phonenumber><type>string</type><length>20</length><name>phonenumber</name></phonenumber><entity_id><type>integer</type><length>2147483647</length><name>entity_id</name></entity_id></columns><relations><Entity><local>entity_id</local><foreign>id</foreign><type>one</type></Entity><Group><local>entity_id</local><foreign>id</foreign><type>one</type></Group><User><local>entity_id</local><foreign>id</foreign><type>one</type></User></relations></Phonenumber><ResourceReference><tableName>resource_reference</tableName><className>ResourceReference</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><type_id><type>integer</type><length>2147483647</length><name>type_id</name></type_id><resource_id><type>integer</type><length>2147483647</length><name>resource_id</name></resource_id></columns><relations><Resource><local>resource_id</local><foreign>id</foreign><type>one</type></Resource><ResourceType><local>resourcetype_id</local><foreign>id</foreign><type>one</type></ResourceType></relations></ResourceReference><Resource><tableName>resource</tableName><className>Resource</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name></columns><relations><TaskAlias><refClass>Assignment</refClass><class>Task</class><local>resource_id</local><foreign>task_id</foreign><type>many</type></TaskAlias><Type><refClass>ResourceReference</refClass><class>ResourceType</class><local>resource_id</local><foreign>type_id</foreign><type>many</type></Type><Assignment><local>id</local><foreign>resource_id</foreign><type>many</type></Assignment><ResourceReference><local>id</local><foreign>resource_id</foreign><type>many</type></ResourceReference></relations></Resource><ResourceType><tableName>resource_type</tableName><className>ResourceType</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><type><type>string</type><length>100</length><name>type</name></type></columns><relations><ResourceAlias><refClass>ResourceReference</refClass><class>Resource</class><local>resourcetype_id</local><foreign>resource_id</foreign><type>many</type></ResourceAlias><ResourceReference><local>id</local><foreign>resourcetype_id</foreign><type>many</type></ResourceReference></relations></ResourceType><Song><tableName>song</tableName><className>Song</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><album_id><type>integer</type><length>2147483647</length><name>album_id</name></album_id><genre><type>string</type><length>20</length><name>genre</name></genre><title><type>string</type><length>30</length><name>title</name></title></columns><relations><Album><local>album_id</local><foreign>id</foreign><type>one</type></Album></relations></Song><Task><tableName>task</tableName><className>Task</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name><parent_id><type>integer</type><length>2147483647</length><name>parent_id</name></parent_id></columns><relations><ResourceAlias><refClass>Assignment</refClass><class>Resource</class><local>task_id</local><foreign>resource_id</foreign><type>many</type></ResourceAlias><Subtask><class>Task</class><local>id</local><foreign>parent_id</foreign><type>many</type></Subtask><Assignment><local>id</local><foreign>task_id</foreign><type>many</type></Assignment></relations></Task><User><tableName>entity</tableName><className>User</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><Address><refClass>EntityAddress</refClass><local>user_id</local><foreign>address_id</foreign><type>many</type></Address><Addresses><refClass>EntityAddress</refClass><class>Address</class><local>user_id</local><foreign>address_id</foreign><type>many</type></Addresses><Album><local>id</local><foreign>user_id</foreign><type>many</type></Album><Book><local>id</local><foreign>user_id</foreign><type>many</type></Book><Group><refClass>Groupuser</refClass><local>user_id</local><foreign>group_id</foreign><type>many</type></Group><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference><EntityAddress><local>id</local><foreign>user_id</foreign><type>many</type></EntityAddress><Groupuser><local>id</local><foreign>user_id</foreign><type>many</type></Groupuser></relations></User></data>
diff --git a/tests/schema.yml b/tests/schema.yml
index 0900824a0..3bd28f62e 100644
--- a/tests/schema.yml
+++ b/tests/schema.yml
@@ -603,6 +603,12 @@ User:
       local: user_id
       foreign: address_id
       type: many
+    Addresses: 
+      refClass: EntityAddress
+      class: Address
+      local: user_id
+      foreign: address_id
+      type: many
     Album: 
       local: id
       foreign: user_id