--- /tmp/old_schema.txt	2014-03-03 06:45:48.771087932 +0100
+++ /tmp/new_schema.txt	2014-03-03 06:45:48.771087932 +0100
@@ -34,6 +34,24 @@ array (
           'type' => 'varchar',
         ),
       ),
+      'foreign keys' =>
+      array (
+        'target_user' =>
+        array (
+          'columns' =>
+          array (
+            'target_id' => 'uid',
+          ),
+          'table' => 'users',
+        ),
+      ),
+      'indexes' =>
+      array (
+        'user_id' =>
+        array (
+          0 => 'user_id',
+        ),
+      ),
       'primary key' =>
       array (
         0 => 'id',
@@ -67,6 +85,36 @@ array (
           'length' => 32,
           'type' => 'varchar',
         ),
+        'test_display_configurable__format' =>
+        array (
+          'length' => 255,
+          'type' => 'varchar',
+        ),
+        'test_display_configurable__value' =>
+        array (
+          'length' => '255',
+          'type' => 'varchar',
+        ),
+        'test_display_non_configurable__format' =>
+        array (
+          'length' => 255,
+          'type' => 'varchar',
+        ),
+        'test_display_non_configurable__value' =>
+        array (
+          'length' => '255',
+          'type' => 'varchar',
+        ),
+        'test_no_display__format' =>
+        array (
+          'length' => 255,
+          'type' => 'varchar',
+        ),
+        'test_no_display__value' =>
+        array (
+          'length' => '255',
+          'type' => 'varchar',
+        ),
         'type' =>
         array (
           'length' => 32,
@@ -82,6 +130,24 @@ array (
           'type' => 'varchar',
         ),
       ),
+      'foreign keys' =>
+      array (
+        'target_user' =>
+        array (
+          'columns' =>
+          array (
+            'target_id' => 'uid',
+          ),
+          'table' => 'users',
+        ),
+      ),
+      'indexes' =>
+      array (
+        'user_id' =>
+        array (
+          0 => 'user_id',
+        ),
+      ),
       'primary key' =>
       array (
         0 => 'id',
@@ -130,6 +196,24 @@ array (
           'type' => 'varchar',
         ),
       ),
+      'foreign keys' =>
+      array (
+        'target_user' =>
+        array (
+          'columns' =>
+          array (
+            'target_id' => 'uid',
+          ),
+          'table' => 'users',
+        ),
+      ),
+      'indexes' =>
+      array (
+        'user_id' =>
+        array (
+          0 => 'user_id',
+        ),
+      ),
       'primary key' =>
       array (
         0 => 'id',
@@ -178,6 +262,24 @@ array (
           'type' => 'varchar',
         ),
       ),
+      'foreign keys' =>
+      array (
+        'target_user' =>
+        array (
+          'columns' =>
+          array (
+            'target_id' => 'uid',
+          ),
+          'table' => 'users',
+        ),
+      ),
+      'indexes' =>
+      array (
+        'user_id' =>
+        array (
+          0 => 'user_id',
+        ),
+      ),
       'primary key' =>
       array (
         0 => 'id',
@@ -226,6 +328,24 @@ array (
           'type' => 'varchar',
         ),
       ),
+      'foreign keys' =>
+      array (
+        'target_user' =>
+        array (
+          'columns' =>
+          array (
+            'target_id' => 'uid',
+          ),
+          'table' => 'users',
+        ),
+      ),
+      'indexes' =>
+      array (
+        'user_id' =>
+        array (
+          0 => 'user_id',
+        ),
+      ),
       'primary key' =>
       array (
         0 => 'id',
@@ -274,6 +394,24 @@ array (
           'type' => 'varchar',
         ),
       ),
+      'foreign keys' =>
+      array (
+        'target_user' =>
+        array (
+          'columns' =>
+          array (
+            'target_id' => 'uid',
+          ),
+          'table' => 'users',
+        ),
+      ),
+      'indexes' =>
+      array (
+        'user_id' =>
+        array (
+          0 => 'user_id',
+        ),
+      ),
       'primary key' =>
       array (
         0 => 'id',
@@ -313,6 +451,9 @@ array (
           'type' => 'varchar',
         ),
       ),
+      'foreign keys' =>
+      array (
+      ),
       'primary key' =>
       array (
         0 => 'id',
@@ -356,11 +497,19 @@ array (
       array (
         'id' =>
         array (
-          'entity_test_mul' => 'id',
-        ),
-        'user_id' =>
-        array (
-          'users' => 'uid',
+          'columns' =>
+          array (
+            'id' => 'id',
+          ),
+          'table' => 'entity_test_mul',
+        ),
+        'target_user' =>
+        array (
+          'columns' =>
+          array (
+            'target_id' => 'uid',
+          ),
+          'table' => 'users',
         ),
       ),
       'indexes' =>
@@ -387,6 +536,11 @@ array (
         array (
           'type' => 'serial',
         ),
+        'langcode' =>
+        array (
+          'length' => 12,
+          'type' => 'varchar',
+        ),
         'revision_id' =>
         array (
           'type' => 'int',
@@ -402,6 +556,9 @@ array (
           'type' => 'varchar',
         ),
       ),
+      'foreign keys' =>
+      array (
+      ),
       'primary key' =>
       array (
         0 => 'id',
@@ -449,11 +606,19 @@ array (
       array (
         'id' =>
         array (
-          'entity_test_mulrev' => 'id',
-        ),
-        'user_id' =>
-        array (
-          'users' => 'uid',
+          'columns' =>
+          array (
+            'id' => 'id',
+          ),
+          'table' => 'entity_test_mulrev',
+        ),
+        'target_user' =>
+        array (
+          'columns' =>
+          array (
+            'target_id' => 'uid',
+          ),
+          'table' => 'users',
         ),
       ),
       'indexes' =>
@@ -504,11 +669,27 @@ array (
       array (
         'id' =>
         array (
-          'entity_test_mulrev' => 'id',
+          'columns' =>
+          array (
+            'id' => 'id',
+          ),
+          'table' => 'entity_test_mulrev',
         ),
-        'user_id' =>
+        'revision_id' =>
         array (
-          'users' => 'uid',
+          'columns' =>
+          array (
+            'revision_id' => 'revision_id',
+          ),
+          'table' => 'entity_test_mulrev_revision',
+        ),
+        'target_user' =>
+        array (
+          'columns' =>
+          array (
+            'target_id' => 'uid',
+          ),
+          'table' => 'users',
         ),
       ),
       'indexes' =>
@@ -546,7 +727,11 @@ array (
       array (
         'id' =>
         array (
-          'entity_test_rev' => 'id',
+          'columns' =>
+          array (
+            'id' => 'id',
+          ),
+          'table' => 'entity_test_mulrev',
         ),
       ),
       'primary key' =>
@@ -590,6 +775,24 @@ array (
           'type' => 'varchar',
         ),
       ),
+      'foreign keys' =>
+      array (
+        'target_user' =>
+        array (
+          'columns' =>
+          array (
+            'target_id' => 'uid',
+          ),
+          'table' => 'users',
+        ),
+      ),
+      'indexes' =>
+      array (
+        'user_id' =>
+        array (
+          0 => 'user_id',
+        ),
+      ),
       'primary key' =>
       array (
         0 => 'id',
@@ -613,6 +816,11 @@ array (
         array (
           'type' => 'serial',
         ),
+        'langcode' =>
+        array (
+          'length' => 12,
+          'type' => 'varchar',
+        ),
         'name' =>
         array (
           'length' => 32,
@@ -637,6 +845,24 @@ array (
           'type' => 'varchar',
         ),
       ),
+      'foreign keys' =>
+      array (
+        'target_user' =>
+        array (
+          'columns' =>
+          array (
+            'target_id' => 'uid',
+          ),
+          'table' => 'users',
+        ),
+      ),
+      'indexes' =>
+      array (
+        'user_id' =>
+        array (
+          0 => 'user_id',
+        ),
+      ),
       'primary key' =>
       array (
         0 => 'id',
@@ -680,11 +906,19 @@ array (
       array (
         'id' =>
         array (
-          'entity_test_rev' => 'id',
-        ),
-        'user_id' =>
-        array (
-          'users' => 'uid',
+          'columns' =>
+          array (
+            'id' => 'id',
+          ),
+          'table' => 'entity_test_rev',
+        ),
+        'target_user' =>
+        array (
+          'columns' =>
+          array (
+            'target_id' => 'uid',
+          ),
+          'table' => 'users',
         ),
       ),
       'indexes' =>