Refactored and redesigned command methods