Add more query api methods