diff --git a/README.md b/README.md
index 3592232..959cfde 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Include the dependency to your project's pom.xml file:
     <dependency>
         <groupId>io.github.openfeign.form</groupId>
         <artifactId>feign-form</artifactId>
-        <version>3.2.2</version>
+        <version>3.3.0</version>
     </dependency>
     ...
 </dependencies>
@@ -124,12 +124,12 @@ Include the dependencies to your project's pom.xml file:
     <dependency>
         <groupId>io.github.openfeign.form</groupId>
         <artifactId>feign-form</artifactId>
-        <version>3.2.2</version>
+        <version>3.3.0</version>
     </dependency>
     <dependency>
         <groupId>io.github.openfeign.form</groupId>
         <artifactId>feign-form-spring</artifactId>
-        <version>3.2.2</version>
+        <version>3.3.0</version>
     </dependency>
     ...
 </dependencies>
diff --git a/feign-form-spring/pom.xml b/feign-form-spring/pom.xml
index 161ce10..c39ea0a 100644
--- a/feign-form-spring/pom.xml
+++ b/feign-form-spring/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <parent>
     <groupId>io.github.openfeign.form</groupId>
     <artifactId>parent</artifactId>
-    <version>3.2.2</version>
+    <version>3.3.0</version>
   </parent>
 
   <name>Open Feign Forms Extension for Spring</name>
@@ -54,7 +54,7 @@ limitations under the License.
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-feign</artifactId>
-      <version>1.3.5.RELEASE</version>
+      <version>1.4.4.RELEASE</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/feign-form/pom.xml b/feign-form/pom.xml
index f749067..6111c46 100644
--- a/feign-form/pom.xml
+++ b/feign-form/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <parent>
     <groupId>io.github.openfeign.form</groupId>
     <artifactId>parent</artifactId>
-    <version>3.2.2</version>
+    <version>3.3.0</version>
   </parent>
 
   <name>Open Feign Forms Core</name>
diff --git a/feign-form/src/main/java/feign/form/FormData.java b/feign-form/src/main/java/feign/form/FormData.java
index e30a83b..b704c8a 100644
--- a/feign-form/src/main/java/feign/form/FormData.java
+++ b/feign-form/src/main/java/feign/form/FormData.java
@@ -17,27 +17,20 @@
 package feign.form;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import lombok.Value;
 
 /**
  * This object encapsulates a byte array and its associated content type.
  * Use if if you want to specify the content type of your provided byte array.
+ *
+ * @author Guillaume Simard
+ * @since 24.03.2018
  */
-
+@Value
 @SuppressFBWarnings({"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
-public final class FormData {
-  private final String contentType;
-  private final byte[] data;
-
-  public FormData (String contentType, byte[] data) {
-    this.contentType = contentType;
-    this.data = data;
-  }
+public class FormData {
 
-  public String getContentType () {
-    return contentType;
-  }
+  String contentType;
 
-  public byte[] getData () {
-    return data;
-  }
+  byte[] data;
 }
diff --git a/feign-form/src/main/java/feign/form/multipart/FormDataWriter.java b/feign-form/src/main/java/feign/form/multipart/FormDataWriter.java
index 07e70c7..952a225 100644
--- a/feign-form/src/main/java/feign/form/multipart/FormDataWriter.java
+++ b/feign-form/src/main/java/feign/form/multipart/FormDataWriter.java
@@ -20,7 +20,13 @@
 
 import lombok.val;
 
+/**
+ *
+ * @author Guillaume Simard
+ * @since 24.03.2018
+ */
 public class FormDataWriter extends AbstractWriter {
+
   @Override
   public boolean isApplicable (Object value) {
     return value instanceof FormData;
diff --git a/pom.xml b/pom.xml
index 191453e..4e6bbe6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
 
   <groupId>io.github.openfeign.form</groupId>
   <artifactId>parent</artifactId>
-  <version>3.2.2</version>
+  <version>3.3.0</version>
   <packaging>pom</packaging>
 
   <parent>
@@ -69,7 +69,7 @@ limitations under the License.
     <url>https://github.com/OpenFeign/feign-form</url>
     <connection>scm:git:https://github.com/OpenFeign/feign-form.git</connection>
     <developerConnection>scm:git:https://github.com/OpenFeign/feign-form.git</developerConnection>
-    <tag>3.2.2</tag>
+    <tag>3.3.0</tag>
   </scm>
 
   <distributionManagement>
@@ -90,7 +90,7 @@ limitations under the License.
 
   <ciManagement>
     <system>Travis</system>
-    <url>https://travis-ci.org/infobip/popout</url>
+    <url>https://travis-ci.org/OpenFeign/feign-form</url>
   </ciManagement>
 
   <developers>
@@ -102,6 +102,9 @@ limitations under the License.
       <name>Tomasz Juchniewicz</name>
       <email>tjuchniewicz@gmail.com</email>
     </developer>
+    <developer>
+      <name>Guillaume Simard</name>
+    </developer>
   </developers>
 
   <dependencyManagement>
@@ -123,7 +126,7 @@ limitations under the License.
     <dependency>
       <groupId>io.github.openfeign</groupId>
       <artifactId>feign-core</artifactId>
-      <version>9.5.1</version>
+      <version>9.6.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -139,7 +142,7 @@ limitations under the License.
     <dependency>
       <groupId>io.github.openfeign</groupId>
       <artifactId>feign-jackson</artifactId>
-      <version>9.5.1</version>
+      <version>9.6.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>