Added ability to define which attributes to watch