added Java support