Added support for device number and serial number (if existent)