More Stream API like
Improvements