Added query modules option