diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm
index 24dcde8a0..1fd184515 100644
--- a/lib/WebGUI/Asset/Event.pm
+++ b/lib/WebGUI/Asset/Event.pm
@@ -1418,9 +1418,10 @@ Indexing the content of attachments and user defined fields. See WebGUI::Asset::
 
 =cut
 
-sub indexContent {
+around indexContent => sub {
+    my $orig = shift;
     my $self = shift;
-    my $indexer = $self->SUPER::indexContent;
+    my $indexer = $self->$orig(@_);
     $indexer->addKeywords($self->userDefined1);
     $indexer->addKeywords($self->userDefined2);
     $indexer->addKeywords($self->userDefined3);
@@ -1429,9 +1430,9 @@ sub indexContent {
     $indexer->addKeywords($self->location);
     my $storage = $self->getStorageLocation;
     foreach my $file (@{$storage->getFiles}) {
-               $indexer->addFile($storage->getPath($file));
+        $indexer->addFile($storage->getPath($file));
     }
-}
+};
 
 
 
diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index def703ae1..151a6de30 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -357,11 +357,12 @@ Indexing the content of the attachment. See WebGUI::Asset::indexContent() for ad
 
 =cut
 
-sub indexContent {
+around indexContent => sub {
+	my $orig = shift;
 	my $self = shift;
-	my $indexer = $self->SUPER::indexContent;
+	my $indexer = $self->$orig(@_);
 	$indexer->addFile($self->getStorageLocation->getPath($self->filename));
-}
+};
 
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm
index ac170eac5..131e9a47c 100644
--- a/lib/WebGUI/Asset/MatrixListing.pm
+++ b/lib/WebGUI/Asset/MatrixListing.pm
@@ -391,12 +391,13 @@ Making private. See WebGUI::Asset::indexContent() for additonal details.
 
 =cut
 
-sub indexContent {
+around indexContent => sub {
+	my $orig = shift;
 	my $self = shift;
-	my $indexer = $self->next::method;
+	my $indexer = $self->$orig(@_);
 	$indexer->setIsPublic(0);
     return undef;
-}
+};
 
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index fb5cc00b3..4026f8838 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -802,21 +802,22 @@ Indexing the content of attachments and user defined fields. See WebGUI::Asset::
 
 =cut
 
-sub indexContent {
-	my $self = shift;
-	my $indexer = $self->SUPER::indexContent;
-	$indexer->addKeywords($self->content);
-	$indexer->addKeywords($self->userDefined1);
-	$indexer->addKeywords($self->userDefined2);
-	$indexer->addKeywords($self->userDefined3);
-	$indexer->addKeywords($self->userDefined4);
-	$indexer->addKeywords($self->userDefined5);
-	$indexer->addKeywords($self->username);
-	my $storage = $self->getStorageLocation;
-	foreach my $file (@{$storage->getFiles}) {
-               $indexer->addFile($storage->getPath($file));
-	}
-}
+around indexContent => sub {
+    my $orig = shift;
+    my $self = shift;
+    my $indexer = $self->$orig(@_);
+    $indexer->addKeywords($self->content);
+    $indexer->addKeywords($self->userDefined1);
+    $indexer->addKeywords($self->userDefined2);
+    $indexer->addKeywords($self->userDefined3);
+    $indexer->addKeywords($self->userDefined4);
+    $indexer->addKeywords($self->userDefined5);
+    $indexer->addKeywords($self->username);
+    my $storage = $self->getStorageLocation;
+    foreach my $file (@{$storage->getFiles}) {
+        $indexer->addFile($storage->getPath($file));
+    }
+};
 
 #-------------------------------------------------------------------
 
diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm
index 45e1e1e0e..24c333239 100644
--- a/lib/WebGUI/Asset/RichEdit.pm
+++ b/lib/WebGUI/Asset/RichEdit.pm
@@ -651,11 +651,12 @@ Making private. See WebGUI::Asset::indexContent() for additonal details.
 
 =cut
 
-sub indexContent {
+around indexContent => sub {
+	my $orig = shift;
 	my $self = shift;
-	my $indexer = $self->SUPER::indexContent;
+	my $indexer = $self->$orig(@_);
 	$indexer->setIsPublic(0);
-}
+};
 
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Asset/Sku.pm b/lib/WebGUI/Asset/Sku.pm
index bbaff1974..b796b6842 100644
--- a/lib/WebGUI/Asset/Sku.pm
+++ b/lib/WebGUI/Asset/Sku.pm
@@ -394,12 +394,13 @@ Adding sku as a keyword. See WebGUI::Asset::indexContent() for additonal details
 
 =cut
 
-sub indexContent {
+around indexContent => sub {
+	my $orig = shift;
 	my $self = shift;
-	my $indexer = $self->SUPER::indexContent;
+	my $indexer = $self->$orig(@_);
     $indexer->addKeywords($self->sku);
 	return $indexer;
-}
+};
 
 #-------------------------------------------------------------------
 
diff --git a/lib/WebGUI/Asset/Sku/EMSTicket.pm b/lib/WebGUI/Asset/Sku/EMSTicket.pm
index 9a97e8ce6..d34e52fdd 100644
--- a/lib/WebGUI/Asset/Sku/EMSTicket.pm
+++ b/lib/WebGUI/Asset/Sku/EMSTicket.pm
@@ -367,12 +367,13 @@ Adding location and eventNumber as a keyword. See WebGUI::Asset::indexContent()
 
 =cut
 
-sub indexContent {
+around indexContent => sub {
+	my $orig = shift;
 	my $self = shift;
-	my $indexer = $self->SUPER::indexContent;
+	my $indexer = $self->$orig(@_);
     $indexer->addKeywords($self->location.' '.$self->eventNumber);
 	return $indexer;
-}
+};
 
 
 
diff --git a/lib/WebGUI/Asset/Snippet.pm b/lib/WebGUI/Asset/Snippet.pm
index a1de5415b..4146510a2 100644
--- a/lib/WebGUI/Asset/Snippet.pm
+++ b/lib/WebGUI/Asset/Snippet.pm
@@ -186,12 +186,13 @@ Indexing the content of the snippet. See WebGUI::Asset::indexContent() for addit
 
 =cut
 
-sub indexContent {
+around indexContent => sub {
+	my $orig = shift;
 	my $self = shift;
-	my $indexer = $self->SUPER::indexContent;
+	my $indexer = $self->$orig(@_);
 	$indexer->addKeywords($self->snippet);
 	$indexer->setIsPublic(0);
-}
+};
 
 #-------------------------------------------------------------------
 
diff --git a/lib/WebGUI/Asset/Story.pm b/lib/WebGUI/Asset/Story.pm
index a0e07aa56..eb398625e 100644
--- a/lib/WebGUI/Asset/Story.pm
+++ b/lib/WebGUI/Asset/Story.pm
@@ -519,11 +519,12 @@ Extend the base class to index Story properties like headline, byline, etc.
 
 =cut
 
-sub indexContent {
+around indexContent => sub {
+	my $orig    = shift;
 	my $self    = shift;
-    my $indexer = $self->next::method();
+    my $indexer = $self->$orig(@_);
     $indexer->addKeywords($self->headline, $self->subtitle, $self->location, $self->highlights, $self->byline, $self->story, );
-}
+};
 
 #-------------------------------------------------------------------
 
diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index e90f32e37..d66fe7705 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -496,12 +496,13 @@ Making private. See WebGUI::Asset::indexContent() for additonal details.
 
 =cut
 
-sub indexContent {
+around indexContent => sub {
+	my $orig = shift;
 	my $self = shift;
-	my $indexer = $self->SUPER::indexContent;
+	my $indexer = $self->$orig(@_);
 	$indexer->addKeywords($self->namespace);
 	$indexer->setIsPublic(0);
-}
+};
 
 #-------------------------------------------------------------------
 
diff --git a/lib/WebGUI/Asset/WikiPage.pm b/lib/WebGUI/Asset/WikiPage.pm
index bcd3e61bf..665d3c773 100644
--- a/lib/WebGUI/Asset/WikiPage.pm
+++ b/lib/WebGUI/Asset/WikiPage.pm
@@ -301,12 +301,13 @@ Extends the master class to handle indexing the wiki content.
 
 =cut
 
-sub indexContent {
+around indexContent => sub {
+	my $orig = shift;
 	my $self = shift;
-	my $indexer = $self->next::method;
+	my $indexer = $self->$orig(@_);
 	$indexer->addKeywords($self->content);
 	return $indexer;
-}
+};
 
 #-------------------------------------------------------------------
 
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index 86c705090..da68249ae 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -319,11 +319,12 @@ Indexing question and answers. See WebGUI::Asset::indexContent() for additonal d
 
 =cut
 
-sub indexContent {
+around indexContent => sub {
+	my $orig = shift;
 	my $self = shift;
-	my $indexer = $self->SUPER::indexContent;
+	my $indexer = $self->$orig(@_);
 	$indexer->addKeywords($self->get("question")." ".$self->get("answers"));
-}
+};
 
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Asset/_NewAsset.skeleton b/lib/WebGUI/Asset/_NewAsset.skeleton
index 492a311b4..126e6a032 100644
--- a/lib/WebGUI/Asset/_NewAsset.skeleton
+++ b/lib/WebGUI/Asset/_NewAsset.skeleton
@@ -143,11 +143,12 @@ Making private. See WebGUI::Asset::indexContent() for additonal details.
 
 =cut
 
-sub indexContent {
+around indexContent => sub {
+    my $orig    = shift;
     my $self    = shift;
-    my $indexer = $self->SUPER::indexContent;
+    my $indexer = $self->$orig(@_);
     $indexer->setIsPublic(0);
-}
+};
 
 #-------------------------------------------------------------------