Added query creator