* Added caching
* Added delimited query format