Added devices and location