Added detection for datawatcher field