Start working on jruby compatibility