diff --git a/README.md b/README.md
index 3858fb3..b0e8129 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Maven:
 <dependency>
   <groupId>com.wikia</groupId>
   <artifactId>dropwizard-logstash-encoder</artifactId>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 8e79d7e..d83ffce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,17 @@
 
   <groupId>com.wikia</groupId>
   <artifactId>dropwizard-logstash-encoder</artifactId>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <name>dropwizard-logstash-encoder</name>
   <description>
     Addon for dropwizard to log using the logback-logstash-encoder (see https://github.com/logstash/logstash-logback-encoder)
   </description>
-  <url>https://github.com/Wikia/dropwizard-logback-logsash-encoder</url>
 
+  <properties>
+    <!-- github server corresponds to entry in ~/.m2/settings.xml -->
+    <github.global.server>github</github.global.server>
+  </properties>
+  
   <licenses>
     <license>
       <name>Eclipse Public License</name>
@@ -19,40 +23,55 @@
     </license>
   </licenses>
 
-  <scm>
-    <connection>scm:git:git://github.com/Wikia/dropwizard-logstash-encoder.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/Wikia/dropwizard-logstash-encoder.git</developerConnection>
-    <url>https://github.com/Wikia/dropwizard-logstash-encoder</url>
-  </scm>
-
-  <developers>
-    <developer>
-      <name>Nelson Monterroso</name>
-      <url>http://github.com/nmonterroso</url>
-      <email>nelson@wikia-inc.com</email>
-    </developer>
-  </developers>
-
   <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
     <repository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+      <id>internal.repo</id>
+      <name>Temporary Staging Repository</name>
+      <url>file://${project.build.directory}/mvn-repo</url>
     </repository>
   </distributionManagement>
-
+ 
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.1</version>
+        <configuration>
+          <altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.github.github</groupId>
+        <artifactId>site-maven-plugin</artifactId>
+        <version>0.11</version>
+        <configuration>
+          <message>Maven artifacts for ${project.version}</message>  <!-- git commit message -->
+          <noJekyll>true</noJekyll>                                  <!-- disable webpage processing -->
+          <outputDirectory>${project.build.directory}/mvn-repo</outputDirectory> <!-- matches distribution management repository url above -->
+          <branch>refs/heads/mvn-repo</branch>                       <!-- remote branch name -->
+          <includes><include>**/*</include></includes>
+          <merge>true</merge>                                        <!-- don't delete old artifacts -->
+          <repositoryName>dropwizard-logstash-encoder</repositoryName>      <!-- github repo name -->
+          <repositoryOwner>sociable</repositoryOwner>    <!-- github username  -->
+        </configuration>
+        <executions>
+          <!-- run site-maven-plugin's 'site' target as part of the build's normal 'deploy' phase -->
+          <execution>
+            <goals>
+              <goal>site</goal>
+            </goals>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.2</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
@@ -81,31 +100,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <version>1.5</version>
-        <executions>
-          <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.3</version>
-        <extensions>true</extensions>
-        <configuration>
-          <serverId>ossrh</serverId>
-          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-          <autoReleaseAfterClose>true</autoReleaseAfterClose>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/src/main/java/com/wikia/dropwizard/logstash/appender/LogstashAppenderFactoryHelper.java b/src/main/java/com/wikia/dropwizard/logstash/appender/LogstashAppenderFactoryHelper.java
index f35c489..c7f31c1 100644
--- a/src/main/java/com/wikia/dropwizard/logstash/appender/LogstashAppenderFactoryHelper.java
+++ b/src/main/java/com/wikia/dropwizard/logstash/appender/LogstashAppenderFactoryHelper.java
@@ -1,32 +1,39 @@
 package com.wikia.dropwizard.logstash.appender;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import net.logstash.logback.fieldnames.LogstashFieldNames;
 
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.HashMap;
+import java.util.Map;
 
 public class LogstashAppenderFactoryHelper {
+    
+  private static String getOrDefault(Map<String,String> map, String key, String defaultValue) {
+    return map.containsKey(key) ? map.get(key) : defaultValue;   
+  }
+  
   public static LogstashFieldNames getFieldNamesFromHashMap(HashMap<String, String> map) {
     LogstashFieldNames fieldNames = new LogstashFieldNames();
 
-    fieldNames.setTimestamp(map.getOrDefault("timestamp", "@timestamp"));
-    fieldNames.setVersion(map.getOrDefault("version", "@version"));
-    fieldNames.setMessage(map.getOrDefault("message", "message"));
-    fieldNames.setLogger(map.getOrDefault("logger", "logger_name"));
-    fieldNames.setThread(map.getOrDefault("thread", "thread_name"));
-    fieldNames.setLevel(map.getOrDefault("level", "level"));
-    fieldNames.setLevelValue(map.getOrDefault("levelValue", "level_value"));
-    fieldNames.setCaller(map.getOrDefault("caller", null));
-    fieldNames.setCallerClass(map.getOrDefault("callerClass", "caller_class_name"));
-    fieldNames.setCallerMethod(map.getOrDefault("callerMethod", "caller_method_name"));
-    fieldNames.setCallerFile(map.getOrDefault("callerFile", "caller_file_name"));
-    fieldNames.setCallerLine(map.getOrDefault("callerLine", "caller_line_number"));
-    fieldNames.setStackTrace(map.getOrDefault("stackTrace", "stack_trace"));
-    fieldNames.setTags(map.getOrDefault("tags", "tags"));
-    fieldNames.setMdc(map.getOrDefault("mdc", null));
-    fieldNames.setContext(map.getOrDefault("context", null));
+    fieldNames.setTimestamp(getOrDefault(map, "timestamp", "@timestamp"));
+    fieldNames.setVersion(getOrDefault(map, "version", "@version"));
+    fieldNames.setMessage(getOrDefault(map, "message", "message"));
+    fieldNames.setLogger(getOrDefault(map, "logger", "logger_name"));
+    fieldNames.setThread(getOrDefault(map, "thread", "thread_name"));
+    fieldNames.setLevel(getOrDefault(map, "level", "level"));
+    fieldNames.setLevelValue(getOrDefault(map, "levelValue", "level_value"));
+    fieldNames.setCaller(getOrDefault(map, "caller", null));
+    fieldNames.setCallerClass(getOrDefault(map, "callerClass", "caller_class_name"));
+    fieldNames.setCallerMethod(getOrDefault(map, "callerMethod", "caller_method_name"));
+    fieldNames.setCallerFile(getOrDefault(map, "callerFile", "caller_file_name"));
+    fieldNames.setCallerLine(getOrDefault(map, "callerLine", "caller_line_number"));
+    fieldNames.setStackTrace(getOrDefault(map, "stackTrace", "stack_trace"));
+    fieldNames.setTags(getOrDefault(map, "tags", "tags"));
+    fieldNames.setMdc(getOrDefault(map, "mdc", null));
+    fieldNames.setContext(getOrDefault(map, "context", null));
 
     return fieldNames;
   }