diff --git a/.gitignore b/.gitignore
index 10b26da..315c7b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ Gemfile.bak
 .bundle
 .vagrant
 .mvn
+vendor
+lib/**/*.jar
diff --git a/.travis.yml b/.travis.yml
index 53ada5d..04b3ca7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,10 @@ language: ruby
 cache: bundler
 rvm:
   - jruby
+before_install:
+  - bundle install
+  - bundle exec rake vendor
+  - bundle exec rake install_jars
 before_script:
   - ./scripts/travis-before_script.sh
   - source ./scripts/travis-variables.sh
diff --git a/README.md b/README.md
index cb34774..4bb1352 100644
--- a/README.md
+++ b/README.md
@@ -35,19 +35,6 @@ For development:
     - Add JDBC jar files to vendor/jar/jdbc in your logstash installation
   - And then configure (examples below)
 
-## Running tests
-For development tests are recommended to run inside a virtual machine (Vagrantfile is included in the repo), as it requires
-access to various database engines and could completely destroy any data in a live system.
-
-If you have vagrant available (this is temporary whilst I'm hacking on v5 support. I'll make this more streamlined later):
-  - `vagrant up`
-  - `vagrant ssh`
-  - `cd /vagrant`
-  - `gem install bundler`
-  - `cd /vagrant && bundle install`
-  - `./scripts/travis-before_script.sh && source ./scripts/travis-variables.sh`
-  - `bundle exec rspec`
-
 ## Configuration options
 
 | Option | Type | Description | Required? | Default |
@@ -70,3 +57,21 @@ If you have vagrant available (this is temporary whilst I'm hacking on v5 suppor
 Example logstash configurations, can now be found in the examples directory. Where possible we try to link every configuration with a tested jar.
 
 If you have a working sample configuration, for a DB thats not listed, pull requests are welcome.
+
+## Development and Running tests
+For development tests are recommended to run inside a virtual machine (Vagrantfile is included in the repo), as it requires
+access to various database engines and could completely destroy any data in a live system.
+
+If you have vagrant available (this is temporary whilst I'm hacking on v5 support. I'll make this more streamlined later):
+  - `vagrant up`
+  - `vagrant ssh`
+  - `cd /vagrant`
+  - `gem install bundler`
+  - `cd /vagrant && bundle install && bundle exec rake vendor && bundle exec rake install_jars`
+  - `./scripts/travis-before_script.sh && source ./scripts/travis-variables.sh`
+  - `bundle exec rspec`
+
+## Releasing
+  - `bundle exec rake install_jars`
+  - `gem build logstash-output-jdbc.gemspec`
+  - `gem push`
diff --git a/Rakefile b/Rakefile
index d50e796..c2f7aea 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1 +1,12 @@
+task :default do
+  system("rake -T")
+end
+
+require 'jars/installer'
+task :install_jars do
+  ENV['JARS_HOME'] = Dir.pwd + "/vendor/jar-dependencies/runtime-jars"
+  ENV['JARS_VENDOR'] = "false"
+  Jars::Installer.new.vendor_jars!(false)
+end
+
 require "logstash/devutils/rake"
diff --git a/lib/logstash/outputs/jdbc.rb b/lib/logstash/outputs/jdbc.rb
index ef07154..f1cca8e 100644
--- a/lib/logstash/outputs/jdbc.rb
+++ b/lib/logstash/outputs/jdbc.rb
@@ -83,6 +83,7 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
   def register
     @logger.info("JDBC - Starting up")
 
+    LogStash::Logger.setup_log4j(@logger)
     load_jar_files!
 
     @exceptions_tracker = RingBuffer.new(@max_flush_exceptions)
@@ -250,10 +251,10 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
 
   def add_statement_event_params(statement, event)
     @statement[1..-1].each_with_index do |i, idx|
-      case event[i]
+      case event.get(i)
       when Time
         # See LogStash::Timestamp, below, for the why behind strftime.
-        statement.setString(idx + 1, event[i].strftime(STRFTIME_FMT))
+        statement.setString(idx + 1, event.get(i).strftime(STRFTIME_FMT))
       when LogStash::Timestamp
         # XXX: Using setString as opposed to setTimestamp, because setTimestamp 
         # doesn't behave correctly in some drivers (Known: sqlite)
@@ -262,19 +263,19 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
         # choke on the 'T' in the string (Known: Derby).
         #
         # strftime appears to be the most reliable across drivers.
-        statement.setString(idx + 1, event[i].time.strftime(STRFTIME_FMT))
+        statement.setString(idx + 1, event.get(i).time.strftime(STRFTIME_FMT))
       when Fixnum, Integer
-        statement.setInt(idx + 1, event[i])
+        statement.setInt(idx + 1, event.get(i))
       when Float
-        statement.setFloat(idx + 1, event[i])
+        statement.setFloat(idx + 1, event.get(i))
       when String
-        statement.setString(idx + 1, event[i])
+        statement.setString(idx + 1, event.get(i))
       when true
         statement.setBoolean(idx + 1, true)
       when false
         statement.setBoolean(idx + 1, false)
       else
-        if event[i].nil? and i =~ /%\{/
+        if event.get(i).nil? and i =~ /%\{/
           statement.setString(idx + 1, event.sprintf(i))
         else
           statement.setString(idx + 1, nil)
diff --git a/logstash-output-jdbc.gemspec b/logstash-output-jdbc.gemspec
index 28b5916..be3a4cb 100644
--- a/logstash-output-jdbc.gemspec
+++ b/logstash-output-jdbc.gemspec
@@ -9,6 +9,9 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/theangryangel/logstash-output-jdbc"
   s.require_paths = [ "lib" ]
 
+  # Java only
+  s.platform = 'java'
+
   # Files
   s.files = Dir.glob("{lib,vendor,spec}/**/*") + %w(LICENSE.txt README.md)
 
@@ -17,11 +20,19 @@ Gem::Specification.new do |s|
 
   # Special flag to let us know this is actually a logstash plugin
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
-
+   
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
   s.add_runtime_dependency 'stud'
   s.add_runtime_dependency "logstash-codec-plain"
-  
+
+  # Stuck on HikariCP 2.4.2 until https://github.com/brettwooldridge/HikariCP/issues/600
+  # is resolved.
+  s.requirements << "jar 'com.zaxxer:HikariCP', '2.4.2'"
+  s.requirements << "jar 'org.slf4j:slf4j-log4j12', '1.7.13'"
+
+  s.add_development_dependency "jar-dependencies"
+  s.add_development_dependency 'ruby-maven', '~> 3.3'
+
   s.add_development_dependency "logstash-devutils"
 end
diff --git a/spec/jdbc_spec_helper.rb b/spec/jdbc_spec_helper.rb
index 9ad7e28..489e32b 100644
--- a/spec/jdbc_spec_helper.rb
+++ b/spec/jdbc_spec_helper.rb
@@ -83,7 +83,7 @@ RSpec.shared_context 'when outputting messages' do
     # Verify the number of items in the output table
     c = plugin.instance_variable_get(:@pool).getConnection()
     stmt = c.prepareStatement("select count(*) as total from #{jdbc_test_table} where message = ?")
-    stmt.setString(1, event['message'])
+    stmt.setString(1, event.get('message'))
     rs = stmt.executeQuery()
     count = 0
     while rs.next()
diff --git a/vendor/jar-dependencies/runtime-jars/HikariCP-2.4.2.jar b/vendor/jar-dependencies/runtime-jars/HikariCP-2.4.2.jar
deleted file mode 100644
index 1c49ac5..0000000
Binary files a/vendor/jar-dependencies/runtime-jars/HikariCP-2.4.2.jar and /dev/null differ
diff --git a/vendor/jar-dependencies/runtime-jars/slf4j-api-1.7.13.jar b/vendor/jar-dependencies/runtime-jars/slf4j-api-1.7.13.jar
deleted file mode 100644
index 4dfaaa8..0000000
Binary files a/vendor/jar-dependencies/runtime-jars/slf4j-api-1.7.13.jar and /dev/null differ
diff --git a/vendor/jar-dependencies/runtime-jars/slf4j-nop-1.7.13.jar b/vendor/jar-dependencies/runtime-jars/slf4j-nop-1.7.13.jar
deleted file mode 100644
index 15a41eb..0000000
Binary files a/vendor/jar-dependencies/runtime-jars/slf4j-nop-1.7.13.jar and /dev/null differ