Change ExecQueryClient to library