Commands preview refactoring.