Refactor CommandeManager