Changes to WatchPointsController