Adding streaming. Switching to JDK8