diff --git a/commerce_license_node.info b/commerce_license_node.info
index ec54a2a..d00f6b2 100644
--- a/commerce_license_node.info
+++ b/commerce_license_node.info
@@ -3,4 +3,5 @@ description = Provides a license type for selling nodes.
 core = 7.x
 package = Commerce (contrib)
 dependencies[] = commerce_license
+dependencies[] = commerce_license_role
 dependencies[] = commerce_license_billing
diff --git a/commerce_license_node.install b/commerce_license_node.install
index 9bc0744..0d38d29 100644
--- a/commerce_license_node.install
+++ b/commerce_license_node.install
@@ -5,19 +5,12 @@
  */
 function commerce_license_node_uninstall() {
   // Delete the fields created and attached to this module's bundles.
-  field_attach_delete_bundle('commerce_license', 'entity');
-
-  // Delete the licenses.
-  $query = new EntityFieldQuery();
-  $query->entityCondition('type', 'commerce_license');
-  $query->entityCondition('bundle', 'node');
-  $node_licenses = $query->execute();
-  entity_delete('commerce_license', $node_licenses);
+  field_attach_delete_bundle('commerce_license', 'node');
 
   // Delete the node field field.
-  field_delete_field('commerce_license_node');
-  field_delete_field('commerce_license_node_quota');
-  field_delete_field('commerce_license_node_usage_product');
+  field_delete_field('cl_node_type');
+  field_delete_field('cl_node_quota');
+  field_delete_field('cl_node_usage_product');
 
   // Delete variable settings.
   variable_del('commerce_license_node_product_types');
diff --git a/commerce_license_node.module b/commerce_license_node.module
index e42e6b4..01b4b3d 100644
--- a/commerce_license_node.module
+++ b/commerce_license_node.module
@@ -31,28 +31,29 @@ function commerce_license_node_menu() {
 }
 
 /**
- * Return a list of product types used for entity licensing.
+ * Return a list of product types used for node licensing.
  *
  * @return
  *   An array of product type machine names.
  */
 function commerce_license_node_product_types() {
-  $entity_product_types = variable_get('commerce_license_node_product_types', array());
-  $entity_product_types = array_filter($entity_product_types);
-  // Return only those $entity_product_types that are still licensable.
+  $node_product_types = variable_get('commerce_license_node_product_types', array());
+  $node_product_types = array_filter($entity_product_types);
+  // Return only those $node_product_types that are still licensable.
   $license_product_types = commerce_license_product_types();
-  return array_intersect($entity_product_types, $license_product_types);
+  return array_intersect($node_product_types, $license_product_types);
 }
 
 /**
  * Implements hook_commerce_license_types_list_alter().
  *
- * Removes the Entity license type option from those product types that don't
+ * Removes the role_node license type option from those product types that don't
  * have it configured.
  */
 function commerce_license_node_commerce_license_types_list_alter(&$types, $product) {
   if (!empty($product) && !in_array($product->type, commerce_license_node_product_types())) {
-    unset($types['node']);
+    // @todo Support license types that inherit role_node.
+    unset($types['role_node']);
   }
 }
 
@@ -67,19 +68,158 @@ function commerce_license_node_flush_caches() {
 }
 
 /**
+ * Returns a list of licensable node types.
+ */
+function commerce_license_node_get_licensable_node_types() {
+  $node_types = array();
+  $query
+    ->entityCondition('entity_type', 'commerce_product')
+    ->entityCondition('bundle', commerce_license_node_product_types())
+    ->propertyCondition('status', 1);
+  $result = $query->execute();
+  if ($result) {
+    $product_ids = array_keys($result['commerce_product']);
+    $products = commerce_product_load_multiple($product_ids);
+    foreach ($products as $product) {
+      $product_wrapper = entity_metadata_wrapper('commerce_product', $product);
+      // @todo Support license types that inherit role_node.
+      if ($product_wrapper->commerce_license_type->value() == 'role_node') {
+        $node_types[] = $product->cl_node_type->value();
+      }
+    }
+  }
+
+  return $node_types;
+}
+
+/**
+ * Returns the main license for the provided uid.
+ *
+ * @param $uid
+ *   The user id.
+ *
+ * @return
+ *   A commerce_license entity, or FALSE if none found.
+ */
+function commerce_license_node_get_master_license($uid) {
+  $license = FALSE;
+  $query = new EntityFieldQuery();
+  $query
+    ->entityCondition('entity_type', 'commerce_license')
+    // @todo Support license types that inherit role_node.
+    ->entityCondition('bundle', 'role_node')
+    ->propertyCondition('uid', $uid)
+    ->propertyCondition('status', COMMERCE_LICENSE_ACTIVE);
+  $result = $query->execute();
+  if ($result) {
+    $license_id = key($result['commerce_license']);
+    $license = entity_load_single('commerce_license', $license_id);
+  }
+
+  return $license;
+}
+
+/**
+ * Returns the node license for the provided nid and uid.
+ *
+ * @param $nid
+ *   The node id.
+ * @param $uid
+ *   The user id.
+ *
+ * @return
+ *   A commerce_license entity, or FALSE if none found.
+ */
+function commerce_license_node_get_node_license($nid, $uid) {
+  $license = FALSE;
+  $query = new EntityFieldQuery();
+  $query
+    ->entityCondition('entity_type', 'commerce_license')
+    ->entityCondition('bundle', 'node')
+    ->propertyCondition('uid', $uid)
+    ->fieldCondition('cl_created_node', 'target_id', $nid);
+  $result = $query->execute();
+  if ($result) {
+    $license_id = key($result['commerce_license']);
+    $license = entity_load_single('commerce_license', $license_id);
+  }
+
+  return $license;
+}
+
+/**
+ * Implements hook_node_update().
+ */
+function commerce_license_node_node_update($node) {
+  if (!in_array($node->type, commerce_license_node_get_licensable_node_types())) {
+    // Only react for licensable node types.
+    return;
+  }
+
+  // The node was just published. Register usage and create a sublicense.
+  if ($node->status = NODE_PUBLISHED && $node->original->status == NODE_NOT_PUBLISHED) {
+    $master_license = commerce_license_node_get_master_license($node->uid);
+    $node_license = commerce_license_node_get_node_license($node->nid, $node->uid);
+    $increment_usage = FALSE;
+    // If there is an expired license for this node, reactivate it.
+    if ($node_license && $node_license->status == COMMERCE_LICENSE_EXPIRED) {
+      $node_license->status = COMMERCE_LICENSE_ACTIVE;
+      $node_license->save();
+      $increment_usage = TRUE;
+    }
+    elseif (!$node_license) {
+      // If no license was found, create one.
+      $usage_product_id = $master_license->wrapper->product->cl_node_usage_product->raw();
+
+      $node_license = entity_create('commerce_license', array('type' => 'node'));
+      $node_license->product_id = $usage_product_id;
+      $node_license->uid = $node->uid;
+      $node_license->status = COMMERCE_LICENSE_ACTIVE;
+      $node_license->save();
+      $increment_usage = TRUE;
+    }
+
+    // Increment usage if a sublicense was activated.
+    if ($increment_usage) {
+      $usage_group = commerce_license_billing_usage_group($master_license, 'nodes');
+      $current_usage = $usage_group->currentUsage();
+      $usage_group->addUsage($master_license->revision_id, $current_usage + 1, REQUEST_TIME);
+    }
+  }
+  // The node was just unpublished.
+  elseif ($node->status == NODE_NOT_PUBLISHED && $node->original->status == NODE_PUBLISHED) {
+    $master_license = commerce_license_node_get_master_license($node->uid);
+    $node_license = commerce_license_node_get_node_license($node->nid, $node->uid);
+    // If there is an active license for this node, expire it.
+    if ($node_license && $node_license->status == COMMERCE_LICENSE_ACTIVE) {
+      $node_license->status = COMMERCE_LICENSE_EXPIRED;
+      $node_license->save();
+
+      // Decrement usage.
+      $usage_group = commerce_license_billing_usage_group($master_license, 'nodes');
+      $current_usage = $usage_group->currentUsage();
+      $usage_group->addUsage($master_license->revision_id, $current_usage - 1, REQUEST_TIME);
+    }
+  }
+}
+
+/**
  * Ensures that the provided product types have the required fields.
  *
+ * Note that fields are prefixed with cl_ and not commerce_license to get
+ * around the 32 character field name length limitation.
+ *
  * Fields:
- * - commerce_license_node: a a list(text) field pointing to a role.
+ * - cl_node_type: a list(text) field pointing to a node type.
  *
  * @param $types
  *   An array of product type machine names.
  */
 function commerce_license_node_configure_product_types($types) {
-  $field = field_info_field('commerce_license_node');
+  $field = field_info_field('cl_node_type');
   if (!$field) {
     $field = array(
-      'field_name' => 'commerce_license_node',
+      'field_name' => 'cl_node_type',
       'cardinality' => 1,
       'type' => 'list_text',
       'locked' => TRUE,
@@ -97,7 +237,7 @@ function commerce_license_node_configure_product_types($types) {
   // Create instances on newly configured product types.
   foreach (array_diff($types, $existing) as $new_bundle) {
     $instance = array(
-      'field_name' => 'commerce_license_node',
+      'field_name' => 'cl_node_type',
       'entity_type' => 'commerce_product',
       'bundle' => $new_bundle,
       'label' => t('Node Type'),
@@ -110,10 +250,10 @@ function commerce_license_node_configure_product_types($types) {
     field_create_instance($instance);
   }
 
-  $field = field_info_field('commerce_license_node_quota');
+  $field = field_info_field('cl_node_quota');
   if (!$field) {
     $field = array(
-      'field_name' => 'commerce_license_node_quota',
+      'field_name' => 'cl_node_quota',
       'cardinality' => 1,
       'type' => 'number_integer',
       'locked' => TRUE,
@@ -129,7 +269,7 @@ function commerce_license_node_configure_product_types($types) {
   // Create instances on newly configured product types.
   foreach (array_diff($types, $existing) as $new_bundle) {
     $instance = array(
-      'field_name' => 'commerce_license_node_quota',
+      'field_name' => 'cl_node_quota',
       'entity_type' => 'commerce_product',
       'description' => t('The number of nodes included in the license.'),
       'bundle' => $new_bundle,
@@ -153,10 +293,10 @@ function commerce_license_node_configure_product_types($types) {
     field_create_instance($instance);
   }
 
-  $field = field_info_field('commerce_license_node_usage_product');
+  $field = field_info_field('cl_node_usage_product');
   if (!$field) {
     $field = array(
-      'field_name' => 'commerce_license_node_usage_product',
+      'field_name' => 'cl_node_usage_product',
       'cardinality' => 1,
       'type' => 'entityreference',
       'locked' => TRUE,
@@ -174,7 +314,7 @@ function commerce_license_node_configure_product_types($types) {
   // Create instances on newly configured product types.
   foreach (array_diff($types, $existing) as $new_bundle) {
     $instance = array(
-      'field_name' => 'commerce_license_node_usage_product',
+      'field_name' => 'cl_node_usage_product',
       'entity_type' => 'commerce_product',
       'description' => t('Used to charge nodes over the included quota.'),
       'bundle' => $new_bundle,
@@ -194,11 +334,11 @@ function commerce_license_node_configure_product_types($types) {
 
   // Remove instances from product types that can no longer have role licenses.
   foreach (array_diff($existing, $types) as $removed_bundle) {
-    $instance = field_info_instance('commerce_product', 'commerce_license_node', $removed_bundle);
+    $instance = field_info_instance('commerce_product', 'cl_node_type', $removed_bundle);
     field_delete_instance($instance, TRUE);
-    $instance = field_info_instance('commerce_product', 'commerce_license_node_quota', $removed_bundle);
+    $instance = field_info_instance('commerce_product', 'cl_node_quota', $removed_bundle);
     field_delete_instance($instance, TRUE);
-    $instance = field_info_instance('commerce_product', 'commerce_license_node_usage_product', $removed_bundle);
+    $instance = field_info_instance('commerce_product', 'cl_node_usage_product', $removed_bundle);
     field_delete_instance($instance, TRUE);
   }
 }
@@ -207,13 +347,5 @@ function commerce_license_node_configure_product_types($types) {
  * Allowed values callback for roles.
  */
 function commerce_license_node_allowed_values($field, $instance, $entity_type, $entity) {
-  // @todo Filter by licensed types.
-//   $node_bundles = node_type_get_names();
-//   $licensed_bundles = variable_get('commerce_license_node_licensed_bundle_types', array());
-//   $return = array();
-//   foreach ($licensed_bundles as $bundle) {
-//     if($bundle != 0)
-//       $return[$bundle] = $node_bundles[$bundle];
-//   }
   return node_type_get_names();
 }
diff --git a/plugins/license_type/CommerceLicenseNode.class.php b/plugins/license_type/CommerceLicenseNode.class.php
index b739c64..99c352a 100644
--- a/plugins/license_type/CommerceLicenseNode.class.php
+++ b/plugins/license_type/CommerceLicenseNode.class.php
@@ -1,40 +1,47 @@
 <?php
 
 /**
- * Role license type.
+ * Node license type.
+ *
+ * This is a child license type of role_node, created for each node published
+ * by the user.
  */
-class CommerceLicenseNode extends CommerceLicenseBase implements CommerceLicenseBillingUsageInterface  {
+class CommerceLicenseNode extends CommerceLicenseBase  {
 
   /**
-   * Implements CommerceLicenseInterface::isConfigurable().
+   * Implements EntityBundlePluginProvideFieldsInterface::fields().
    */
-  public function isConfigurable() {
-    return FALSE;
-  }
-
-  /**
-   * Implements CommerceLicenseBillingUsageInterface::usageGroups().
-   */
-  public function usageGroups() {
-    $node_type = node_type_load($this->wrapper->product->commerce_license_node->value());
-
-    $return[$node_type->type] = array(
-      'title' => $node_type->name,
-      'type' => 'gauge',
-      'product' => $this->wrapper->product->commerce_license_node_usage_product->sku->value(),
-      'immediate' => TRUE,
-      'free_quantity' => $this->wrapper->product->commerce_license_node_quota->value(),
+  static function fields() {
+    $fields = parent::fields();
+    $fields['cl_created_node']['field'] = array(
+      'cardinality' => 1,
+      'translatable' => FALSE,
+      'settings' => array(
+        'target_type' => 'node',
+        'handler' => 'base',
+      ),
+      'module' => 'entityreference',
+      'type' => 'entityreference',
+    );
+    $fields['cl_created_node']['instance'] = array(
+      'label' => t('Created node'),
+      'display' => array(
+        'full' => array(
+          'label' => 'hidden',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 10,
+        ),
+        'line_item' => array(
+          'label' => 'hidden',
+          'settings' => array(),
+          'type' => 'hidden',
+          'weight' => 10,
+        ),
+      ),
     );
 
-    return $return;
+    return $fields;
   }
 
-  /**
-   * Implements CommerceLicenseBillingUsageInterface::usageDetails().
-   */
-  public function usageDetails() {
-    $node_type = node_type_load($this->wrapper->product->commerce_license_node->value());
-    $usage = commerce_license_billing_current_usage($this, $node_type->type);
-    return t('@type: @entities', array('@type' => $node_type->name, '@entites' => $usage));
-  }
 }
diff --git a/plugins/license_type/CommerceLicenseRoleNode.class.php b/plugins/license_type/CommerceLicenseRoleNode.class.php
new file mode 100644
index 0000000..995e6d8
--- /dev/null
+++ b/plugins/license_type/CommerceLicenseRoleNode.class.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Extends the role license type with the ability to create paid nodes.
+ */
+class CommerceLicenseRoleNode extends CommerceLicenseRole implements CommerceLicenseBillingUsageInterface  {
+
+  /**
+   * Implements CommerceLicenseBillingUsageInterface::usageGroups().
+   */
+  public function usageGroups() {
+    $return['nodes'] = array(
+      'title' => 'Created content',
+      'type' => 'gauge',
+      'product' => $this->wrapper->product->cl_node_usage_product->sku->value(),
+      'free_quantity' => $this->wrapper->product->cl_node_quota->value(),
+      'immediate' => TRUE,
+      'not_charged' => TRUE,
+    );
+
+    return $return;
+  }
+
+  /**
+   * Implements CommerceLicenseBillingUsageInterface::usageDetails().
+   */
+  public function usageDetails() {
+    $usage = commerce_license_billing_current_usage($this, 'nodes');
+    return t('Created content: @nodes', array('@nodes' => $usage));
+  }
+}
diff --git a/plugins/license_type/node.inc b/plugins/license_type/node.inc
index 8f1b578..8a84819 100644
--- a/plugins/license_type/node.inc
+++ b/plugins/license_type/node.inc
@@ -8,4 +8,5 @@
 $plugin = array(
   'title' => t('Node'),
   'class' => 'CommerceLicenseNode',
+  'no ui' => TRUE,
 );
diff --git a/plugins/license_type/role_node.inc b/plugins/license_type/role_node.inc
new file mode 100644
index 0000000..94cbfbf
--- /dev/null
+++ b/plugins/license_type/role_node.inc
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * @file
+ * Provides a license type plugin.
+ */
+
+$plugin = array(
+  'title' => t('Role + Nodes'),
+  'class' => 'CommerceLicenseRoleNode',
+);
