Porting to Java8 and new Stream API