Update demo scripts with the new wrappers

Update the demo scripts using the new wrappers API.