* Added call limits
* Refactored query structure