Adding ability to watch value changes