diff --git a/special_menu_items.module b/special_menu_items.module
index bcdd664..92ea51b 100644
--- a/special_menu_items.module
+++ b/special_menu_items.module
@@ -28,6 +28,18 @@ function special_menu_items_menu() {
     'type' => MENU_CALLBACK,
   );
 
+  $items['<current>'] = array(
+    'page callback' => 'drupal_not_found',
+    'access callback' => TRUE, 
+    'type' => MENU_CALLBACK,
+  );
+  
+  $items['<column>'] = array(
+    'page callback' => 'drupal_not_found',
+    'access callback' => TRUE,
+    'type' => MENU_CALLBACK,
+  );
+  
   $items['admin/config/system/special_menu_items'] = array(
     'title' => 'Special Menu Items',
     'description' => 'Configure Special Menu Items.',
@@ -64,7 +76,7 @@ function special_menu_items_link(array $variables) {
 
 function special_menu_items_menu_link(array $variables) {
   // Find special menu link
-  if (in_array($variables['element']['#href'], array('<nolink>', '<separator>'))) {
+  if (in_array($variables['element']['#href'], array('<nolink>', '<separator>', '<current>', '<column>'))) {
     $element = $variables['element'];
     $sub_menu = '';
 
@@ -88,7 +100,23 @@ function special_menu_items_menu_link(array $variables) {
       case '<separator>':
         $output = variable_get('special_menu_items_separator_value', '<hr>');
         $element['#attributes']['class'][] = 'separator';
+        break;
 
+      case '<current>':
+        $dest = drupal_get_destination();
+        $dest = (!empty($dest['destination'])) ? $dest['destination'] : '';
+        $output = l($element['#title'], $dest, $element['#localized_options']);
+        break;
+
+      case '<column>':
+        $tag = variable_get('special_menu_items_column_tag', '<span>');
+        $title = $element['#title'];
+        $title = ($title == '<none>') ? '' : $title;
+        $output = special_menu_items_render_menu_item($tag, $title);
+        $element['#attributes']['class'][] = 'column';
+        if (empty($title)) {
+          $element['#attributes']['class'][] = 'no-header';          
+        }
         break;
     }