Enable watch support