Changed so that to be a complete device, you only need Location and identifier