diff --git a/aspectwerkz/plugin.jelly b/aspectwerkz/plugin.jelly
index baa5f78a..a5bcc8f0 100644
--- a/aspectwerkz/plugin.jelly
+++ b/aspectwerkz/plugin.jelly
@@ -98,17 +98,8 @@
 
   <!--
      ========================================================================
-       Weave aspects at build time (offline mode). Works for both "xmldef"
-       and "attribdef" modes.
-     ========================================================================
-  -->
-  <goal name="aspectwerkz:weave" 
-      prereqs="aspectwerkz:aspectc,aspectwerkz:aspectwerkc"
-      description="Weave aspects (offline mode)"/>
-
-  <!--
-     ========================================================================
-       Weave "attribdef" aspects at build time (offline mode).
+       Parse files for custom javadoc tags (attribef mode only) and weave
+       them in the bytecode of the aspects themselves. 
      ========================================================================
   -->
   <goal name="aspectwerkz:aspectc" prereqs="aspectwerkz:init,java:compile">
@@ -151,43 +142,42 @@
 
   <!--
      ========================================================================
-       Weave "xmldef" aspects at build time (offline mode).
+       Weave aspects at build time (offline mode). Works for both "xmldef"
+       and "attribdef" modes.
      ========================================================================
   -->
-  <goal name="aspectwerkz:aspectwerkc"
-      prereqs="aspectwerkz:init,aspectwerkz:attributec,java:compile">
-
-    <j:if test="${context.getVariable('maven.aspectwerkz.mode') == 'xmldef'}">
+  <goal name="aspectwerkz:weave"
+      prereqs="aspectwerkz:init,aspectwerkz:attributec,aspectwerkz:aspectc,java:compile">
 
       <!-- TODO: Add support for extension classes -->
 
-      <ant:java dir="${maven.build.dir}" failonerror="true" fork="true"
-          classname="org.codehaus.aspectwerkz.compiler.AspectWerkzC">
+    <ant:java dir="${maven.build.dir}" failonerror="true" fork="true"
+        classname="org.codehaus.aspectwerkz.compiler.AspectWerkzC">
 
-        <j:if test="${context.getVariable('maven.aspectwerkz.verbose') == 'true'}">
-          <ant:sysproperty key="aspectwerkz.transform.verbose" value="true"/>
-        </j:if>
+      <j:if test="${context.getVariable('maven.aspectwerkz.verbose') == 'true'}">
+        <ant:sysproperty key="aspectwerkz.transform.verbose" value="true"/>
+      </j:if>
         
-        <ant:sysproperty key="aspectwerkz.transform.filter" 
-            value="${maven.aspectwerkz.transform.filter}"/>
-        <ant:sysproperty key="aspectwerkz.definition.file" 
-            value="${maven.aspectwerkz.definition.file}"/>
+      <ant:sysproperty key="aspectwerkz.transform.filter" 
+          value="${maven.aspectwerkz.transform.filter}"/>
+      <ant:sysproperty key="aspectwerkz.definition.file" 
+          value="${maven.aspectwerkz.definition.file}"/>
 
-        <ant:arg value="-verify"/>
+      <ant:arg value="-verify"/>
 
-        <ant:arg file="${maven.aspectwerkz.build.dir}"/>
+      <ant:arg file="${maven.aspectwerkz.build.dir}"/>
         
-        <ant:classpath>
-          <ant:path refid="classpath.main"/>
-          <ant:pathelement location="${plugin.getDependencyPath('ant:ant')}"/>
-          <ant:pathelement location="${plugin.getDependencyPath('aspectwerkz:aspectwerkz-core')}"/>
-          <ant:pathelement location="${plugin.getDependencyPath('bcel:bcel')}"/>
-        </ant:classpath>      
+      <ant:classpath>
+        <ant:path refid="classpath.main"/>
+        <ant:pathelement location="${plugin.getDependencyPath('ant:ant')}"/>
+        <ant:pathelement location="${plugin.getDependencyPath('aspectwerkz:aspectwerkz-core')}"/>
+        <ant:pathelement location="${plugin.getDependencyPath('bcel:bcel')}"/>
+        <ant:pathelement location="${plugin.getDependencyPath('jrexx:jrexx')}"/>
+        <ant:pathelement location="${plugin.getDependencyPath('commons-jexl:commons-jexl')}"/>
+      </ant:classpath>      
   
-      </ant:java>
+    </ant:java>
 
-    </j:if>
-    
   </goal>
     
 </project>
diff --git a/aspectwerkz/project.xml b/aspectwerkz/project.xml
index 7986c734..27eaa05a 100644
--- a/aspectwerkz/project.xml
+++ b/aspectwerkz/project.xml
@@ -46,9 +46,6 @@
       <artifactId>aspectwerkz</artifactId>
       <version>0.9.RC1</version>
     </dependency>
-
-    <!-- Required for Attribute compilation -->
-
     <dependency>
       <groupId>qdox</groupId>
       <artifactId>qdox</artifactId>
@@ -59,9 +56,6 @@
       <artifactId>jrexx</artifactId>
       <version>1.1.1</version>
     </dependency>
-
-    <!-- Required for AspectWerkz offline compilation -->
-
     <dependency>
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>
@@ -72,9 +66,6 @@
       <artifactId>bcel</artifactId>
       <version>5.1</version>
     </dependency>
-
-    <!-- Required both for Attribute and AspectWerkz compilations -->
-
     <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
@@ -85,6 +76,11 @@
       <artifactId>trove</artifactId>
       <version>1.0.2</version>
     </dependency>
+    <dependency>
+      <groupId>commons-jexl</groupId>
+      <artifactId>commons-jexl</artifactId>
+      <version>1.0-beta-2</version>
+    </dependency>
   </dependencies>
   <reports>
     <report>maven-changes-plugin</report>