Added query possibility.