More change to support multiple instances of a device type