Added query support, unimplemented