Added watches for options and data