Added support for capability queries