Added javassist dependency
Solder modifications and patch (disabled)
Update deps