Added query capabilities.