Command refactored