Adjust Demos to new API