diff --git a/pom.xml b/pom.xml
index 233218e..e3104b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,85 +15,85 @@
     limitations under the License.
  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <groupId>org.osc.api</groupId>
-	<version>2.0.0-SNAPSHOT</version>
-	<description>OSC SDN Controller API</description>
-	<artifactId>sdn-controller-api</artifactId>
-	<name>org.osc.api:sdn-controller-api</name>
+    <version>2.0.0-SNAPSHOT</version>
+    <description>OSC SDN Controller API</description>
+    <artifactId>sdn-controller-api</artifactId>
+    <name>org.osc.api:sdn-controller-api</name>
 
-	<distributionManagement>
-		<repository>
-			<id>osc-nexus</id>
-			<url>https://ci.opensecuritycontroller.org:8081/nexus/content/repositories/releases</url>
-		</repository>
+    <distributionManagement>
+        <repository>
+            <id>osc-nexus</id>
+            <url>https://ci.opensecuritycontroller.org:8081/nexus/content/repositories/releases</url>
+        </repository>
         <snapshotRepository>
-			<id>osc-nexus</id>
-			<url>https://ci.opensecuritycontroller.org:8081/nexus/content/repositories/osc-snapshot</url>
-		</snapshotRepository>
-	</distributionManagement>
-	
-	<repositories>
-		<repository>
-			<id>osc-nexus</id>
-			<name>OSC Nexus</name>
-			<url>http://ci.opensecuritycontroller.org:8082/nexus/content/repositories/releases</url>
-		</repository>
-	</repositories>
-	
-	<dependencies>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>osgi.annotation</artifactId>
+            <id>osc-nexus</id>
+            <url>https://ci.opensecuritycontroller.org:8081/nexus/content/repositories/osc-snapshot</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <repositories>
+        <repository>
+            <id>osc-nexus</id>
+            <name>OSC Nexus</name>
+            <url>http://ci.opensecuritycontroller.org:8082/nexus/content/repositories/releases</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.annotation</artifactId>
             <version>6.0.1</version>
             <scope>provided</scope>
-		</dependency>
-	</dependencies>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.6.0</version>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
 
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.5</version>
-				<configuration>
-					<archive>
-						<manifestEntries>
-							<Build-Time>${maven.build.timestamp}</Build-Time>
-							<Implementation-Build>${fullVersion}</Implementation-Build>
-						</manifestEntries>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Build-Time>${maven.build.timestamp}</Build-Time>
+                            <Implementation-Build>${fullVersion}</Implementation-Build>
+                        </manifestEntries>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-					</archive>
-				</configuration>
-			</plugin>
+                    </archive>
+                </configuration>
+            </plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>3.0.0</version>				
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
-			<plugin>
-				<groupId>biz.aQute.bnd</groupId>
-				<artifactId>bnd-maven-plugin</artifactId>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
                 <version>3.3.0</version>
                 <executions>
                     <execution>
@@ -103,108 +103,113 @@
                         </goals>
                     </execution>
                 </executions>
-			</plugin>
-            
+            </plugin>
+
             <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.15</version>
-				<dependencies>
-					<dependency>
-						<groupId>com.puppycrawl.tools</groupId>
-						<artifactId>checkstyle</artifactId>
-						<version>6.7</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<phase>verify</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<configuration>
-							<configLocation>checkstyle.xml</configLocation>
-							<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-							<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							<!-- Turning the fail-on-violation flag on -->
-							<failOnViolation>true</failOnViolation>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-            
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.15</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.puppycrawl.tools</groupId>
+                        <artifactId>checkstyle</artifactId>
+                        <version>6.7</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <configLocation>checkstyle.xml</configLocation>
+                            <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+                            <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                            <!-- Turning the fail-on-violation flag on -->
+                            <failOnViolation>true</failOnViolation>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>3.0.1</version>
-				<configuration>
-					<effort>Max</effort>
-					<threshold>High</threshold>
-					<xmlOutput>true</xmlOutput>
-					<!-- Turning the fail-on-error flag on. -->
-					<failOnError>true</failOnError>
-					<omitVisitors>DefaultEncodingDetector</omitVisitors>
-					<argLine>-Xmx1024m</argLine>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>verify</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>3.0.1</version>
+                <configuration>
+                    <effort>Max</effort>
+                    <threshold>High</threshold>
+                    <xmlOutput>true</xmlOutput>
+                    <!-- Turning the fail-on-error flag on. -->
+                    <failOnError>true</failOnError>
+                    <omitVisitors>DefaultEncodingDetector</omitVisitors>
+                    <argLine>-Xmx1024m</argLine>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
-			    <groupId>org.apache.maven.plugins</groupId>
-			    <artifactId>maven-deploy-plugin</artifactId>
-			    <version>2.8.2</version>
-			    <executions>
-			        <execution>
-			            <phase>deploy</phase>
-			            <configuration>
-			                <packaging>jar</packaging>
-			                <generatePom>true</generatePom>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+                <executions>
+                    <execution>
+                        <phase>deploy</phase>
+                        <configuration>
+                            <packaging>jar</packaging>
+                            <generatePom>true</generatePom>
                             <url>${deployFileUrl}</url>
-			                <artifactId>${project.artifactId}</artifactId>
-			                <groupId>${project.groupId}</groupId>
-			                <version>${project.version}</version>
-			                <file>${project.build.directory}/${project.build.finalName}.jar</file>
-			            </configuration>
-			        </execution>
-			     </executions>
-			 </plugin>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
-				<executions>
-					<execution>
-						<id>extract-release-version</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								<!-- Full version examples: 1.0.0-SNAPSHOT-0-HASH, 1.0.0-0-HASH, 1.0.0-1-HASH, etc -->
-                                <exec outputproperty="fullVersion" dir="." executable="sh">
-									<arg value="-c" />
-									<arg value="git describe --long | tr -d v" />
-								</exec>
-                                <!-- Version examples: 1.0.0-SNAPSHOT, 1.0.0, etc -->
-                                <exec outputproperty="releaseVersion" dir="." executable="sh">
-									<arg value="-c" />
-									<arg value="git describe --abbrev=0 | tr -d v" />
-								</exec>
-								<echo>Full Version: ${fullVersion}</echo>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <groupId>${project.groupId}</groupId>
+                            <version>${project.version}</version>
+                            <file>${project.build.directory}/${project.build.finalName}.jar</file>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <id>extract-release-version</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <!-- Full version examples: 1.0.0-SNAPSHOT-0-HASH, 
+                                    1.0.0-0-HASH, 1.0.0-1-HASH, etc -->
+                                <exec outputproperty="fullVersion"
+                                    dir="." executable="sh">
+                                    <arg value="-c" />
+                                    <arg value="git describe --long | tr -d v" />
+                                </exec>
+                                <!-- Version examples: 1.0.0-SNAPSHOT, 1.0.0, 
+                                    etc -->
+                                <exec outputproperty="releaseVersion"
+                                    dir="." executable="sh">
+                                    <arg value="-c" />
+                                    <arg
+                                        value="git describe --abbrev=0 | tr -d v" />
+                                </exec>
+                                <echo>Full Version: ${fullVersion}</echo>
                                 <echo>Version: ${releaseVersion}</echo>
-							</target>
-							<exportAntProperties>true</exportAntProperties>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+                            </target>
+                            <exportAntProperties>true</exportAntProperties>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -219,9 +224,12 @@
                             <rules>
                                 <requireProperty>
                                     <property>project.version</property>
-                                    <message>The project version must be set.</message>
+                                    <message>The project version must be
+                                        set.</message>
                                     <regex>${releaseVersion}</regex>
-                                    <regexMessage>The project version is ${project.version} but it must be ${releaseVersion}.</regexMessage>
+                                    <regexMessage>The project version is
+                                        ${project.version} but it must
+                                        be ${releaseVersion}.</regexMessage>
                                 </requireProperty>
                             </rules>
                             <fail>true</fail>
@@ -230,25 +238,28 @@
                 </executions>
             </plugin>
             <plugin>
-	  		    <groupId>biz.aQute.bnd</groupId>
-	  		    <artifactId>bnd-baseline-maven-plugin</artifactId>
-	  		    <version>3.3.0</version>
-	  		    <configuration>
-	  		    		<failOnMissing>true</failOnMissing>		    	
-	  					<continueOnError>false</continueOnError>
-	  					<fullReport>true</fullReport>
-	  					<includeDistributionManagement>false</includeDistributionManagement>
-	  				</configuration>
-	  		    <executions>
-	  		        <execution>
-	  		            <id>baseline</id>
-	  		            <goals>
-	  		                <goal>baseline</goal>
-	  		            </goals>
-	  		        </execution>
-	  		    </executions>
-  		    </plugin>
-  		    <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-baseline-maven-plugin</artifactId>
+                <version>3.3.0</version>
+                <configuration>
+                    <failOnMissing>true</failOnMissing>
+                    <continueOnError>false</continueOnError>
+                    <fullReport>true</fullReport>
+                    <includeDistributionManagement>false</includeDistributionManagement>
+                    <base>
+                        <version>1.0.0</version>
+                    </base>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>baseline</id>
+                        <goals>
+                            <goal>baseline</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.10.4</version>
@@ -261,36 +272,36 @@
                     </execution>
                 </executions>
             </plugin>
-		</plugins>
-	</build>
+        </plugins>
+    </build>
     <reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-				<version>3.0.1</version>
-				<configuration>
-					<effort>Max</effort>
-					<threshold>High</threshold>
-					<omitVisitors>DefaultEncodingDetector</omitVisitors>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.15</version>
-				<configuration>
-					<configLocation>checkstyle.xml</configLocation>
-				</configuration>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>checkstyle</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-	</reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>3.0.1</version>
+                <configuration>
+                    <effort>Max</effort>
+                    <threshold>High</threshold>
+                    <omitVisitors>DefaultEncodingDetector</omitVisitors>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.15</version>
+                <configuration>
+                    <configLocation>checkstyle.xml</configLocation>
+                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>checkstyle</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
 
 </project>
\ No newline at end of file