Adding a query wrapper for own server queries