Refactored console commands