Added basic watch support