Added java version
Improved java version