Started implementation of the streaming api