Support Dquery 0.7.0