Add Java support