Added query capabilities