Improve client API
Improve queries