diff --git a/salesforce_api/salesforce_api.admin.inc b/salesforce_api/salesforce_api.admin.inc
index 8092bf2..f8748bc 100644
--- a/salesforce_api/salesforce_api.admin.inc
+++ b/salesforce_api/salesforce_api.admin.inc
@@ -658,6 +658,7 @@ function salesforce_api_fieldmap_edit_form($form, &$form_state, $fieldmap) {
   // Adding fixed value and evaluate PHP options
   $options = salesforce_api_fieldmap_field_options($source);
   $options['Other']['fixed'] = t('Fixed value');
+  $options['Other']['tokens'] = t('Tokens value');
   if ( user_access('use php for salesforce fixed values') ) {
     $options['Other']['php'] = t('Evaluate PHP');
   }
@@ -764,6 +765,20 @@ function salesforce_api_fieldmap_edit_form($form, &$form_state, $fieldmap) {
   // Combine the rows arrays into one with required fields displayed first.
   $form['fields']['rows'] = array_merge($rows['required'], $rows['optional']);
   $form['fields']['rows']['#tree'] = TRUE;
+
+  // Tokens Help
+  $form['token_help'] = array(
+    '#title' => t('Replacement patterns'),
+    '#type' => 'fieldset',
+    //'#collapsible' => TRUE,
+    //'#collapsed' => TRUE,
+  );
+  $form['token_help']['help'] = array(
+    '#theme' => 'token_tree',
+    '#token_types' => array($map->drupal_entity),
+    '#global_types' => TRUE,
+  );
+
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save changes'),
diff --git a/salesforce_api/salesforce_api.module b/salesforce_api/salesforce_api.module
index ca6c20b..17dbeb3 100644
--- a/salesforce_api/salesforce_api.module
+++ b/salesforce_api/salesforce_api.module
@@ -1009,6 +1009,11 @@ function salesforce_api_fieldmap_export_create($name, $drupal_data = NULL) {
             $value = $map->fields[$sf_fieldname]['value'];
           }
           break;
+        case 'tokens':
+          if (isset($map->fields[$sf_fieldname]['value'])) {
+            $value = token_replace($map->fields[$sf_fieldname]['value'], array($map->drupal_entity => $drupal_data), array('clear' => TRUE, 'sanitize' => FALSE));
+          }
+          break;
         case 'php':
           if (isset($map->fields[$sf_fieldname]['value'])) {
             $value = eval($map->fields[$sf_fieldname]['value']);