diff --git a/eck.module b/eck.module
index f304fb9..0c862db 100644
--- a/eck.module
+++ b/eck.module
@@ -887,3 +887,23 @@ function eck_clean_path($path) {
   }  
   return implode("/", $paths);
 }
+
+/**
+ * Implements hook_field_extra_fields().
+ */
+function eck_field_extra_fields() {
+  $extra = array();
+
+  foreach(EntityType::loadAll() as $entity_type){
+    foreach(Bundle::loadByEntityType($entity_type) as $bundle){
+      foreach($entity_type->properties as $property_name => $property_info) {
+        $extra[$entity_type->name][$bundle->name]['form'][$property_name] = array(
+          'label' => $property_info['label'],
+          'description' => t('Entity property'),
+          'weight' => 0,
+        );
+      }
+    }
+  }
+  return $extra;
+}
\ No newline at end of file