Add support for A queries