Hello team, Today I started work on the (real) machine units watcher as well as converting the old watchers to the new format. This is taking longer than expected because of code inertia, sorry about that. This watcher will probably be ready tomorrow, and once I have the framework in place, converting the old ones should not take more than one day.