Adding java8 back