Added query ability