Added query_mod