Fix javadoc
Refactor streaming event