Add back device info stuff