Separate out client from query builders