Including more data about devices and services