diff --git a/.travis.yml b/.travis.yml
index 6b3fb21..774b42c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,18 +2,16 @@ language: java
 sudo: false
 addons:
     sonarcloud:
-        organization: "tastybento-github"
+        organization: "bentobox-world"
         token:
             secure: $SONAR_TOKEN
-        branches:
-            - develop
-            - master
 jdk:
     - openjdk8
     
 script:
   # JaCoCo is used to have code coverage, the agent has to be activated
   #- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent org.jacoco:jacoco-maven-plugin:report package sonar:sonar
+  - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=BentoBoxWorld_AcidIsland
 
 cache:
     directories:
diff --git a/pom.xml b/pom.xml
index bfb6c2a..76a506c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,14 +112,14 @@
             <id>sonar</id>
             <properties>
                 <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-                <sonar.organization>tastybento-github</sonar.organization>
+                <sonar.organization>bentobox-world</sonar.organization>
             </properties>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.sonarsource.scanner.maven</groupId>
                         <artifactId>sonar-maven-plugin</artifactId>
-                        <version>3.4.1.1168</version>
+                        <version>3.6.0.1398</version>
                         <executions>
                             <execution>
                                 <phase>verify</phase>
@@ -183,6 +183,15 @@
             <version>${bentobox.version}</version>
             <scope>provided</scope>
         </dependency>
+        <!-- Static analysis -->
+        <!-- We are using Eclipse's annotations. If you're using IDEA, update 
+            your project settings to take these into account for in real time static 
+            analysis -->
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+            <version>2.2.200</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -311,8 +320,8 @@
                 <configuration>
                     <append>true</append>
                     <excludes>
-                        <!-- This is required to prevent Jacoco from adding synthetic fields
-                            to a JavaBean class (causes errors in testing) -->
+                        <!-- This is required to prevent Jacoco from adding 
+                            synthetic fields to a JavaBean class (causes errors in testing) -->
                         <exclude>**/*Names*</exclude>
                     </excludes>
                 </configuration>