Added support for java