Refactor to make sure Firmware is always the first device