Thor Command Improvements