Updating ServerClient with context