Implemented standalone inquiers to match Cloud's API