[Change] updated Query API