Add query and ping