Add support for java