Adding watch support
Updating