Fix in cloud performer.
Refactor.