Implemented new watch

* Old watch methods have been removed
* Implemented new callback handlers for onWatchCb
* added new Filter JS object