Moved to Java 8