Watch Refactor

Allow to watch only one specific property