Updated Command Handling