diff --git a/.gitignore b/.gitignore
index ce664c0..0aaa0ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,105 @@ project/plugins/project/
 /.settings
 /target
 /.idea
-/*.iml
\ No newline at end of file
+/*.iml
+
+# Created by https://www.gitignore.io/api/java,maven,intellij+iml
+
+### Intellij+iml ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### Intellij+iml Patch ###
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Maven ###
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
+!/.mvn/wrapper/maven-wrapper.jar
+
+# End of https://www.gitignore.io/api/java,maven,intellij+iml
\ No newline at end of file
diff --git a/src/main/scala/com/arangodb/velocypack/module/scala/VPackScalaModule.scala b/src/main/scala/com/arangodb/velocypack/module/scala/VPackScalaModule.scala
index 157d2a0..61d038a 100644
--- a/src/main/scala/com/arangodb/velocypack/module/scala/VPackScalaModule.scala
+++ b/src/main/scala/com/arangodb/velocypack/module/scala/VPackScalaModule.scala
@@ -10,12 +10,12 @@ class VPackScalaModule extends VPackModule {
 
   def setup[C <: VPackSetupContext[C]](context: C): Unit = {
     context.registerDeserializer(classOf[Option[Any]], VPackScalaDeserializers.OPTION)
-    context.registerDeserializer(classOf[List[Any]], VPackScalaDeserializers.LIST)
-    context.registerDeserializer(classOf[Map[Any, Any]], VPackScalaDeserializers.MAP)
+    context.registerDeserializer(classOf[collection.List[Any]], VPackScalaDeserializers.LIST)
+    context.registerDeserializer(classOf[collection.Map[Any, Any]], VPackScalaDeserializers.MAP)
 
     context.registerSerializer(classOf[Option[Any]], VPackScalaSerializers.OPTION)
-    context.registerSerializer(classOf[List[Any]], VPackScalaSerializers.LIST)
-    context.registerSerializer(classOf[Map[Any, Any]], VPackScalaSerializers.MAP)
+    context.registerSerializer(classOf[collection.List[Any]], VPackScalaSerializers.LIST)
+    context.registerSerializer(classOf[collection.Map[Any, Any]], VPackScalaSerializers.MAP)
     context.registerEnclosingSerializer(classOf[Map[Any, Any]], VPackScalaSerializers.MAP)
   }