Migration to java8