Used new Java 8 stream api