diff --git a/open-api/pom.xml b/open-api/pom.xml
index 19f9bd28284f97c01987026bce1074cab44b8718..553b11207de1410c28cf5bad86b1d18a92c002c3 100644
--- a/open-api/pom.xml
+++ b/open-api/pom.xml
@@ -22,14 +22,19 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.6</version>
+            <version>1.6.1</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 
@@ -57,9 +62,11 @@
                             <generateSupportingFiles>false</generateSupportingFiles>
                             <generateAliasAsModel>true</generateAliasAsModel>
                             <library>resttemplate</library>
-                            <modelPackage>de.fitko.fitconnect.api.domain.model</modelPackage>
+                            <modelPackage>de.fitko.fitconnect.api.domain.model.submission</modelPackage>
                             <configOptions>
                                 <sourceFolder>../../../src/main/java</sourceFolder>
+                                <additionalModelTypeAnnotations>@lombok.Builder
+                                </additionalModelTypeAnnotations>
                             </configOptions>
                         </configuration>
                     </execution>