JDK support added.