Adding Java8 support