Add watch support