Fixed Demo Suite to match new APIs