Add basic query feature