Update API to be more stream like
0.0.2