Enhancements to the existing examples