Add querying for capabilities