Added streams and more lambdas