Revised Enumeration & Control for devices