Inputs are now devices
dictionary or name and path for Device
dictionary or name and path for Device
Collection is now generic