Add support for NED queries