Added Java support