diff --git a/twitter_actions/twitter_actions.module b/twitter_actions/twitter_actions.module
index 79e8f92..ecb30f3 100644
--- a/twitter_actions/twitter_actions.module
+++ b/twitter_actions/twitter_actions.module
@@ -15,10 +15,10 @@ function twitter_actions_action_info() {
       'label' => t('Post a message to Twitter'),
       'configurable' => TRUE,
       'triggers' => array(
-        'nodeapi_view',
-        'nodeapi_insert',
-        'nodeapi_update',
-        'nodeapi_delete',
+        'node_view',
+        'node_insert',
+        'node_update',
+        'node_delete',
         'comment_view',
         'comment_insert',
         'comment_update',
@@ -28,7 +28,7 @@ function twitter_actions_action_info() {
         'user_update',
         'user_delete',
         'user_login',
-        'cron_run',
+        'cron',
       ),
     ),
   );
@@ -102,15 +102,32 @@ function twitter_actions_set_status_action_submit($form, $form_state) {
 
 /**
  * Implementation of a configurable Drupal action.
- * Sends an email.
+ * 
  */
 function twitter_actions_set_status_action($object, $context) {
   global $user;
   $variables['%site_name'] = variable_get('site_name', 'Drupal');
-
-  switch ($context['hook']) {
-    case 'nodeapi':
+  // Seting variables array depending on action's group
+  switch ($context['group']) {
+    case 'node':
+      $node = $context['node'];
+      if (isset($node)) {
+        $summary = isset($node->body['und'][0]['value']) ? $node->body['und'][0]['summary'] : ''; // TODO: This is hardcoded, we need to change it
+        $body = isset($node->body['und'][0]['value']) ? $node->body['und'][0]['value'] : ''; // TODO: This is hardcoded, we need to change it
+        $variables = array_merge($variables, array(
+          '%uid' => $node->uid,
+          '%username' => $node->name,
+          '%node_url' => url('node/' . $node->nid, array('absolute' => TRUE)),
+          '%node_type' => node_type_get_name($node),
+          '%title' => $node->title,
+          '%teaser' => $summary, 
+          '%body' => $body, 
+          )
+        );
+      }
+      break;
     case 'workflow':
+      // TODO: Get some information about what is this for.
       // Because this is not an action of type 'node' the node
       // will not be passed as $object, but it will still be available
       // in $context.
@@ -118,62 +135,49 @@ function twitter_actions_set_status_action($object, $context) {
       break;
       // The comment hook provides nid, in $context.
     case 'comment':
-      $comment = $context['comment'];
-      $node = node_load($comment->nid);
+      $node = node_load($context['comment']->nid);
+      if (isset($node)) {
+        $summary = isset($node->body['und'][0]['value']) ? $node->body['und'][0]['summary'] : ''; // TODO: This is hardcoded, we need to change it
+        $body = isset($node->body['und'][0]['value']) ? $node->body['und'][0]['value'] : ''; // TODO: This is hardcoded, we need to change it
+        $variables = array_merge($variables, array(
+          '%uid' => $context['comment']->uid,
+          '%username' => $node->name,
+          '%node_url' => url('node/' . $node->nid, array('absolute' => TRUE)),
+          '%node_type' => node_type_get_name($node),
+          '%title' => $node->title,
+          '%teaser' => $summary,
+          '%body' => $body,
+          )
+        );
+      }
+      break;
     case 'user':
       // Because this is not an action of type 'user' the user
       // object is not passed as $object, but it will still be available
       // in $context.
-      $account = $context['account'];
-      if (isset($context['node'])) {
-        $node = $context['node'];
-      }
-      elseif ($context['recipient'] == '%author') {
-        // If we don't have a node, we don't have a node author.
-        watchdog('error', 'Cannot use %author token in this context.');
-        return;
-      }
-      break;
-    case 'taxonomy':
-      $account = $user;
-      $vocabulary = taxonomy_vocabulary_load($object->vid);
-      $variables = array_merge($variables, array(
-        '%term_name' => $object->name,
-        '%term_description' => $object->description,
-        '%term_id' => $object->tid,
-        '%vocabulary_name' => $vocabulary->name,
-        '%vocabulary_description' => $vocabulary->description,
-        '%vocabulary_id' => $vocabulary->vid,
-      )
-      );
+      $variables['%username'] = $context['user']->name;
       break;
+      
+    case 'cron':
+      //TODO: See if we need to set some variables here.
+    break;
     default:
       // We are being called directly.
       $node = $object;
-  }
-
-  if (isset($node)) {
-    if (!isset($account)) {
-      $account = user_load($node->uid);
-    }
-    if ($recipient == '%author') {
-      $recipient = $account->mail;
-    }
-  }
-
-  $variables['%username'] = $account->name;
-
-  // Node-based variable translation is only available if we have a node.
-  if (isset($node) && is_object($node)) {
-    $variables = array_merge($variables, array(
-      '%uid' => $node->uid,
-      '%node_url' => url('node/' . $node->nid, array('absolute' => TRUE)),
-      '%node_type' => node_type_get_name($node),
-      '%title' => $node->title,
-      '%teaser' => $node->teaser,
-      '%body' => $node->body,
-    )
-    );
+      if (isset($node)  && is_object($node)) {
+        $summary = isset($node->body['und'][0]['value']) ? $node->body['und'][0]['summary'] : ''; // TODO: This is hardcoded, we need to change it
+        $body = isset($node->body['und'][0]['value']) ? $node->body['und'][0]['value'] : ''; // TODO: This is hardcoded, we need to change it
+        $variables = array_merge($variables, array(
+          '%uid' => $node->uid,
+          '%username' => $node->name,
+          '%node_url' => url('node/' . $node->nid, array('absolute' => TRUE)),
+          '%node_type' => node_type_get_name($node),
+          '%title' => $node->title,
+          '%teaser' => $summary,
+          '%body' => $body,
+          )
+        );
+      }
   }
 
   // Only make a tinyurl if it was asked for.
@@ -182,9 +186,7 @@ function twitter_actions_set_status_action($object, $context) {
       '%tinyurl' => twitter_shorten_url(url('node/' . $node->nid, array('absolute' => TRUE))),
     ));
   }
-
   $message = strtr($context['message'], $variables);
-
   module_load_include('inc', 'twitter');
   $twitter_account = twitter_account_load($context['twitter_uid']);
   twitter_set_status($twitter_account, $message);