Update code with Ch. 3 and Ch. 4 samples and configuration