Add Java8 hooks