Added relation between devices and location