Refactored Commands