Refactored command classes