Watch command refactored excepted for websocket option