Adapted demo to latest changes.