Added query helper on runtime