Synchronized to new Java 8 streams API