Match query methods to real API