Expand support to the rest of the devices I have