Added java support