I'm not sure I'm totally convinced about this separation - I don't really see it as any cleaner, and it seems like it might unnecessarily increase load on the Registry (i.e. etcd). Consolidating the two would also keep the Registry interface simpler, since GetActiveMachines() already returns all MachineStates