Switch up some logic, experience stupid string key in affiliation
Add new device