Added jdk8 support.