Moving to java 8