Updated client boilerplate.