diff --git a/plugins/content_types/bean_panels.inc b/plugins/content_types/bean_panels.inc
index 14c4d47..2dc938d 100755
--- a/plugins/content_types/bean_panels.inc
+++ b/plugins/content_types/bean_panels.inc
@@ -7,20 +7,49 @@
  */
 
 $plugin = array(
-  'title' => t('Rendered bean'),
-  'defaults' => array('view_mode' => 'full', 'bean_delta' => ''),
-  'category' => t('Beans')
+  'title' => t('List of beans'),
+  'content type' => 'bean_panels_bean_panels_content_type_content_type',
 );
 
 /**
- * Returns an edit form for a entity.
- *
- * Rendered entity use entity types machine name as subtype name.
- *
- * @see bean_panels_bean_panels_view_get_content_types()
+ * One single Bean.
+ */
+function bean_panels_bean_panels_content_type_content_type($subtype) {
+  $beans = bean_panels_bean_panels_content_type_content_types();
+  if (isset($beans[$subtype])) {
+    return $beans[$subtype];
+  }
+}
+
+/**
+ * List of available beans.
+ */
+function bean_panels_bean_panels_content_type_content_types() {
+  $bean_list = &drupal_static(__FUNCTION__, array());
+  if (!empty($bean_list)) {
+    return $bean_list;
+  }
+
+  $beans = bean_get_all_beans();
+  foreach($beans as $bean) {
+    $bean_list['bean:' . $bean->delta] = array(
+      'title' => format_string('@label [@type]', array('@label' => $bean->label, '@type' => $bean->type)),
+      'category' => t('Beans'),
+      'edit form' => 'bean_panels_bean_panels_content_type_edit_form',
+    );
+  }
+
+  return $bean_list;
+}
+
+/**
+ * Edit form for adding new bean
  */
 function bean_panels_bean_panels_content_type_edit_form($form, &$form_state) {
   $conf = $form_state['conf'];
+  list( , $bean_delta) = explode(':', $form_state['pane']->subtype);
+  $form_state['conf']['bean_delta'] = $bean_delta;
+
   $entity_info = entity_get_info('bean');
 
   $options = array();
@@ -52,16 +81,10 @@ function bean_panels_bean_panels_content_type_edit_form($form, &$form_state) {
     );
   }
 
-  $form['bean_delta'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Bean delta'),
-    '#description' => t('Enter the bean delta to use in this pane.'),
-    '#default_value' => $conf['bean_delta']
-  );
-
   return $form;
 }
 
+
 /**
  * Save selected view mode.
  */
@@ -69,9 +92,6 @@ function bean_panels_bean_panels_content_type_edit_form_submit(&$form, &$form_st
   if (isset($form_state['values']['view_mode'])) {
     $form_state['conf']['view_mode'] = $form_state['values']['view_mode'];
   }
-  if (isset($form_state['values']['bean_delta'])) {
-    $form_state['conf']['bean_delta'] = $form_state['values']['bean_delta'];
-  }
 }
 
 /**
@@ -99,15 +119,6 @@ function bean_panels_bean_panels_content_type_render($entity_type, $conf, $panel
       $block->content['#contextual_links']['bean'] = array('block', array($delta));
     }
   }
-  elseif (bean_add_page_access()) {
-    $block->content = array(
-      '#markup' => t('Bean with delta %delta does not exist, please <a href="!url">create it first</a>.',
-                    array(
-                      '!url' => url('block/add'),
-                      '%delta' => $delta
-                    ))
-    );
-  }
   return $block;
 }