Updated CommandManager to be compatible with PWP

EchoPet should be compatible with PWP again.