diff --git a/pav-server/build.gradle b/pav-server/build.gradle
index e1abe7af..92faf42e 100644
--- a/pav-server/build.gradle
+++ b/pav-server/build.gradle
@@ -124,14 +124,25 @@ tasks.withType(Test) {
 }
 
 def querydslDir = "$buildDir/generated/querydsl"
+def mapstructDir = "$buildDir/generated/sources/annotationProcessor/java/main"
+
 querydsl {
     jpa = true
     querydslSourcesDir = querydslDir
 }
+
 sourceSets {
     main.java.srcDir querydslDir
-    main.java.srcDirs += "build/generated/sources/annotationProcessor/java/main"
+	main.java.srcDir mapstructDir 
 }
+
+sourceSets.each { srcSet ->
+            println "["+srcSet.name+"]"
+            print "-->Source directories: "+srcSet.allJava.srcDirs+"\n"
+            print "-->Output directories: "+srcSet.output.classesDirs.files+"\n"
+            println ""
+        }
+
 configurations {
     querydsl.extendsFrom compileClasspath
 }
diff --git a/pav-server/lib/lombok.jar b/pav-server/lib/lombok.jar
new file mode 100644
index 00000000..811346fe
Binary files /dev/null and b/pav-server/lib/lombok.jar differ
diff --git a/pav-server/lib/mapstruct-processor-1.5.5.Final.jar b/pav-server/lib/mapstruct-processor-1.5.5.Final.jar
new file mode 100644
index 00000000..ca7dda52
Binary files /dev/null and b/pav-server/lib/mapstruct-processor-1.5.5.Final.jar differ