Add the ability for devices to be uniquely idenitified