adding Query support