Add support Java 8