Add support for interaction in queries