Updated to java 8