diff --git a/pom.xml b/pom.xml
index 5e2c24e5d..a288948ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,13 +2,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.beowulfe.hap</groupId>
   <artifactId>hap-sample</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>0.0.2-SNAPSHOT</version>
   <name>hap-java-sample</name>
   <dependencies>
   	<dependency>
   		<groupId>io.github.hap-java</groupId>
   		<artifactId>hap</artifactId>
-  		<version>1.2.0-snapshot</version>
+  		<version>2.0.0-snapshot</version>
   	</dependency>
   	<dependency>
 		<groupId>ch.qos.logback</groupId>
@@ -28,6 +28,35 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<!-- Build an executable JAR -->
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>lib/</classpathPrefix>
+							<mainClass>com.beowulfe.hap.sample.Main</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>install</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/src/main/java/com/beowulfe/hap/sample/Main.java b/src/main/java/com/beowulfe/hap/sample/Main.java
index 733a47b31..078a45d45 100644
--- a/src/main/java/com/beowulfe/hap/sample/Main.java
+++ b/src/main/java/com/beowulfe/hap/sample/Main.java
@@ -6,8 +6,8 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import io.github.hapjava.HomekitRoot;
-import io.github.hapjava.HomekitServer;
+import io.github.hapjava.server.impl.HomekitRoot;
+import io.github.hapjava.server.impl.HomekitServer;
 
 public class Main {
 
@@ -32,7 +32,8 @@ public static void main(String[] args) {
             }
 
             HomekitServer homekit = new HomekitServer(PORT);
-            HomekitRoot bridge = homekit.createBridge(mockAuth, "TestBridge", "TestBridge, Inc.", "G6", "111abe234");
+            HomekitRoot bridge = homekit.createBridge(mockAuth, "Test Bridge", "TestBridge, Inc.", "G6", "111abe234", "1.1", "1.2");
+
 
             mockAuth.onChange(state -> {
                 try {
diff --git a/src/main/java/com/beowulfe/hap/sample/MockAuthInfo.java b/src/main/java/com/beowulfe/hap/sample/MockAuthInfo.java
index cf47956c4..e445398b2 100644
--- a/src/main/java/com/beowulfe/hap/sample/MockAuthInfo.java
+++ b/src/main/java/com/beowulfe/hap/sample/MockAuthInfo.java
@@ -3,8 +3,9 @@
 import java.math.BigInteger;
 import java.security.InvalidAlgorithmParameterException;
 import java.util.function.Consumer;
-import io.github.hapjava.HomekitAuthInfo;
-import io.github.hapjava.HomekitServer;
+
+import io.github.hapjava.server.HomekitAuthInfo;
+import io.github.hapjava.server.impl.HomekitServer;
 
 /**
  * This is a simple implementation that should never be used in actual production. The mac, salt, and privateKey
diff --git a/src/main/java/com/beowulfe/hap/sample/MockSwitch.java b/src/main/java/com/beowulfe/hap/sample/MockSwitch.java
index a44e4a30f..5808976f7 100644
--- a/src/main/java/com/beowulfe/hap/sample/MockSwitch.java
+++ b/src/main/java/com/beowulfe/hap/sample/MockSwitch.java
@@ -1,10 +1,12 @@
 package com.beowulfe.hap.sample;
 
 import java.util.concurrent.CompletableFuture;
-import io.github.hapjava.HomekitCharacteristicChangeCallback;
-import io.github.hapjava.accessories.Lightbulb;
 
-public class MockSwitch implements Lightbulb {
+import io.github.hapjava.accessories.LightbulbAccessory;
+import io.github.hapjava.accessories.optionalcharacteristic.AccessoryWithHardwareRevision;
+import io.github.hapjava.characteristics.HomekitCharacteristicChangeCallback;
+
+public class MockSwitch implements LightbulbAccessory, AccessoryWithHardwareRevision {
 	
 	private boolean powerState = false;
 	private HomekitCharacteristicChangeCallback subscribeCallback = null;
@@ -15,8 +17,8 @@ public int getId() {
 	}
 
 	@Override
-	public String getLabel() {
-		return "Test Lightbulb";
+	public CompletableFuture<String> getName() {
+		return CompletableFuture.completedFuture("Test Switch Name");
 	}
 
 	@Override
@@ -25,18 +27,23 @@ public void identify() {
 	}
 
 	@Override
-	public String getSerialNumber() {
-		return "none";
+	public CompletableFuture<String> getSerialNumber() {
+		return CompletableFuture.completedFuture("Test SwitchSN");
+	}
+
+	@Override
+	public CompletableFuture<String> getModel() {
+		return CompletableFuture.completedFuture("TestSwitch Model");
 	}
 
 	@Override
-	public String getModel() {
-		return "none";
+	public CompletableFuture<String> getManufacturer() {
+		return CompletableFuture.completedFuture("Test SwitchManufacturer");
 	}
 
 	@Override
-	public String getManufacturer() {
-		return "none";
+	public CompletableFuture<String> getFirmwareRevision() {
+		return CompletableFuture.completedFuture("Test Switch Firmware");
 	}
 
 	@Override
@@ -66,4 +73,8 @@ public void unsubscribeLightbulbPowerState() {
 		this.subscribeCallback = null;
 	}
 
+	@Override
+	public CompletableFuture<String> getHardwareRevision() {
+		return CompletableFuture.completedFuture("Test Switch Hardware");
+	}
 }
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100644
index 000000000..83266680b
--- /dev/null
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="TRACE">
+  <Appenders>
+    <Console name="console" target="SYSTEM_OUT">
+      <PatternLayout
+        pattern="[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1} - %msg%n" />
+    </Console>
+  </Appenders>
+  <Loggers>
+    <Logger name="io.github" level="debug" additivity="false">
+      <AppenderRef ref="console"/>
+    </Logger>
+    <Root level="TRACE" additivity="false">
+      <AppenderRef ref="console" />
+    </Root>
+  </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 0e383f4ac..dc8dfec8a 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -21,7 +21,7 @@
 		</encoder>
 	</appender>
 	
-	<logger name="com.beowulfe.hap" level="DEBUG" />
+	<logger name="io.github.hapjava" level="DEBUG" />
 
 	<root level="info">
 		<appender-ref ref="STDOUT" />
diff --git a/src/main/resources/simplelogger.properties b/src/main/resources/simplelogger.properties
new file mode 100644
index 000000000..5c89a5a26
--- /dev/null
+++ b/src/main/resources/simplelogger.properties
@@ -0,0 +1 @@
+org.slf4j.simpleLogger.defaultLogLevel=DEBUG
\ No newline at end of file