Updated demo to be compatible with the latest changes