Finishing updage to java8