Moved to Java 8 support