Fixing demos related to recent API refactor.
Fixing latest demo changes related to API refactoring.