Client update

Merging updates to client for remote querying.