Added mechanism to change the number of active devices (units), and avoid explicit enable/disable at the unit level.