updated schema with watched table