diff --git a/api/pom.xml b/api/pom.xml
index c62cd72..3823c52 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>seam-rest-parent</artifactId>
         <groupId>org.jboss.seam.rest</groupId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>seam-rest-api</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>Seam REST Module API</name>
diff --git a/dist/pom.xml b/dist/pom.xml
index 945c43f..fc5e552 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jboss.seam.rest</groupId>
         <artifactId>seam-rest-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/dist/src/main/assembly/assembly.xml b/dist/src/main/assembly/assembly.xml
index 90e65ba..e1a368a 100644
--- a/dist/src/main/assembly/assembly.xml
+++ b/dist/src/main/assembly/assembly.xml
@@ -1,6 +1,8 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
 
+    <id>distribution</id>
+
     <formats>
         <format>zip</format>
     </formats>
diff --git a/docs/reference/pom.xml b/docs/reference/pom.xml
old mode 100755
new mode 100644
index 93b9848..b1f551b
--- a/docs/reference/pom.xml
+++ b/docs/reference/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.jboss.seam.rest</groupId>
     <artifactId>seam-rest-reference-guide</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <packaging>jdocbook</packaging>
     <name>Seam REST Reference Guide</name>
     <url>http://seamframework.org/Seam3/RESTModule</url>
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.jboss.seam.rest</groupId>
         <artifactId>seam-rest-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/docs/reference/src/main/docbook/en-US/version_info.xml b/docs/reference/src/main/docbook/en-US/version_info.xml
index fe23368..812f50a 100644
--- a/docs/reference/src/main/docbook/en-US/version_info.xml
+++ b/docs/reference/src/main/docbook/en-US/version_info.xml
@@ -1 +1 @@
-<releaseinfo>3.0.1-SNAPSHOT</releaseinfo>
\ No newline at end of file
+<releaseinfo>3.1.0.Beta1</releaseinfo>
\ No newline at end of file
diff --git a/examples/client/pom.xml b/examples/client/pom.xml
index 629c633..76cf253 100644
--- a/examples/client/pom.xml
+++ b/examples/client/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.jboss.seam.rest</groupId>
         <artifactId>seam-rest-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <groupId>org.jboss.seam.rest</groupId>
     <artifactId>seam-rest-example-client</artifactId>
     <packaging>war</packaging>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <name>Seam REST Client Example</name>
     <url>http://seamframework.org/Seam3/RESTModule</url>
 
diff --git a/examples/client/src/main/assembly/assembly.xml b/examples/client/src/main/assembly/assembly.xml
index 78a93b3..98dc00d 100644
--- a/examples/client/src/main/assembly/assembly.xml
+++ b/examples/client/src/main/assembly/assembly.xml
@@ -1,6 +1,6 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>distribution</id>
     <formats>
         <format>zip</format>
     </formats>
diff --git a/examples/exceptions/pom.xml b/examples/exceptions/pom.xml
index d8eea63..4b08abb 100644
--- a/examples/exceptions/pom.xml
+++ b/examples/exceptions/pom.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.jboss.seam.rest</groupId>
         <artifactId>seam-rest-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <groupId>org.jboss.seam.rest</groupId>
     <artifactId>seam-rest-example-exceptions</artifactId>
     <packaging>war</packaging>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <name>Seam REST Exceptions Example</name>
     <url>http://seamframework.org/Seam3/RESTModule</url>
 
diff --git a/examples/exceptions/src/main/assembly/assembly.xml b/examples/exceptions/src/main/assembly/assembly.xml
index 78a93b3..98dc00d 100644
--- a/examples/exceptions/src/main/assembly/assembly.xml
+++ b/examples/exceptions/src/main/assembly/assembly.xml
@@ -1,6 +1,6 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>distribution</id>
     <formats>
         <format>zip</format>
     </formats>
diff --git a/examples/tasks/pom.xml b/examples/tasks/pom.xml
index 0d83ebd..833dfbf 100644
--- a/examples/tasks/pom.xml
+++ b/examples/tasks/pom.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.jboss.seam.rest</groupId>
         <artifactId>seam-rest-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <groupId>org.jboss.seam.rest</groupId>
     <artifactId>seam-rest-example-tasks</artifactId>
     <packaging>war</packaging>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <name>Seam REST Tasks Example</name>
     <url>http://seamframework.org/Seam3/RESTModule</url>
 
diff --git a/examples/tasks/src/main/assembly/assembly.xml b/examples/tasks/src/main/assembly/assembly.xml
index fde92bc..b44b761 100644
--- a/examples/tasks/src/main/assembly/assembly.xml
+++ b/examples/tasks/src/main/assembly/assembly.xml
@@ -1,6 +1,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>distribution</id>
     <formats>
         <format>zip</format>
     </formats>
diff --git a/impl/pom.xml b/impl/pom.xml
index 3a503e4..d90bb5d 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -1,16 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <artifactId>seam-rest-parent</artifactId>
         <groupId>org.jboss.seam.rest</groupId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>seam-rest</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>Seam REST Module Implementation</name>
@@ -86,6 +85,7 @@
         <dependency>
             <groupId>org.jboss.shrinkwrap.resolver</groupId>
             <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+            <scope>test</scope>
         </dependency>
         
         <dependency>
diff --git a/pom.xml b/pom.xml
index 90432f2..ecf89bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.jboss.seam.rest</groupId>
     <artifactId>seam-rest-parent</artifactId>
     <name>Seam REST Parent</name>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>