Added query handlers.