Added better watch support handling on sync