Updated device mapping and PID
more updates