Add support for the device numbering convention