Upgraded to Java8