CDK-575: Updates to the demo example to work post CDK-140.