Command refactorings