1) Updates for device and client examples