Add id-querying for devices