Added a couple of features to model client sample.