Add small improvements
Introduce Streaming API
Restore single keyword