Added query and get methods