Updated to use streams and monitors new concepts.
Change checks references to monitors references