Support Java 8+9ea