Added query functions to listeners. You can now lisen to these as well