Refactors for new system esp. JRuby