diff --git a/FeedsCommentProcessor.inc b/FeedsCommentProcessor.inc
index 141b89d..9230bb8 100644
--- a/FeedsCommentProcessor.inc
+++ b/FeedsCommentProcessor.inc
@@ -17,7 +17,7 @@ define('FEEDS_COMMENT_UPDATE_EXISTING', 2);
 /**
  * Creates comments from feed items.
  */
-class FeedsCommentProcessor extends FeedsProcessor {
+class FeedsCommentProcessor extends FeedsNodeProcessor {
   /**
    * Define entity type.
    */
@@ -125,7 +125,11 @@ class FeedsCommentProcessor extends FeedsProcessor {
    * Override parent::configDefaults().
    */
   public function configDefaults() {
+    $types = node_type_get_names();
+    $type = key($types);
+
     $defaults = parent::configDefaults();
+    $defaults['content_type'] = $type;
     $defaults['input_format'] = filter_default_format();
     $defaults['expire'] = FEEDS_EXPIRE_NEVER;
     $defaults['author'] = 0;
@@ -137,11 +141,19 @@ class FeedsCommentProcessor extends FeedsProcessor {
    */
   public function configForm(&$form_state) {
     $form = array();
+    $types = node_type_get_names();
     $format_options = array(filter_default_format() => t('Default format'));
     $formats = filter_formats();
     foreach ($formats as $format) {
       $format_options[$format->format] = $format->name;
     }
+    $form['content_type'] = array(
+      '#type' => 'select',
+      '#title' => t('Content type'),
+      '#description' => t('Select the content type for the nodes the comments are attached to.'),
+      '#options' => $types,
+      '#default_value' => $this->config['content_type'],
+    );
     $form['input_format'] = array(
       '#type' => 'select',
       '#title' => t('Input format'),
@@ -204,9 +216,6 @@ class FeedsCommentProcessor extends FeedsProcessor {
           ->execute()
           ->fetchField();
         break;
-      case 'comment':
-        $target_comment->comment_body[$target_comment->language][0]['value'] = $value;
-        break;
       case 'guid':
         $target_comment->feeds_comment_item->guid = $value;
         break;
@@ -241,10 +250,6 @@ class FeedsCommentProcessor extends FeedsProcessor {
         'name' => t('Title'),
         'description' => t('The title of the comment.'),
       ),
-      'comment' => array(
-        'name' => t('Comment'),
-        'description' => t('The comment body.'),
-      ),
       'hostname' => array(
         'name' => t('Hostname'),
         'description' => t('The author\'s host name.'),
@@ -278,7 +283,10 @@ class FeedsCommentProcessor extends FeedsProcessor {
 
     // Let other modules expose mapping targets.
     self::loadMappers();
-    feeds_alter('feeds_comment_processor_targets', $targets);
+
+    $entity_type = $this->entityType();
+    $bundle = 'comment_node_' . $this->config['content_type'];
+    feeds_alter('feeds_processor_targets', $targets, $entity_type, $bundle);
 
     return $targets;
   }
@@ -296,7 +304,7 @@ class FeedsCommentProcessor extends FeedsProcessor {
     foreach ($this->uniqueTargets($source, $result) as $target => $value) {
       switch ($target) {
         case 'guid':
-          $cid = db_query("SELECT cid FROM {feeds_comment_item} WHERE feed_nid = :feed_nid AND id = :id AND guid = :guid", array(':feed_nid' => $source->feed_nid, ':id' => $source->id, ':guid' => $value))->fetchField();
+          $cid = db_query("SELECT entity_id FROM {feeds_item} WHERE feed_nid = :feed_nid AND id = :id AND guid = :guid", array(':feed_nid' => $source->feed_nid, ':id' => $source->id, ':guid' => $value))->fetchField();
           break;
       }
       if ($cid) {
diff --git a/feeds_comment_processor.info b/feeds_comment_processor.info
index b035c77..f0c77d1 100644
--- a/feeds_comment_processor.info
+++ b/feeds_comment_processor.info
@@ -7,3 +7,10 @@ core = 7.x
 php = 5.2
 
 files[] = FeedsCommentProcessor.inc
+
+; Information added by  packaging script on 2013-11-13
+version = "7.x-1.0-beta1+2-dev"
+core = "7.x"
+project = "feeds_comment_processor"
+datestamp = "1384353527"
+