Added Streams and Mapper