Much better Query API.