Upgraded to JDK 8