Revert "SimpleCommandMap instead of CommandMap"

This reverts commit 4dc2c8de9e7d33452f7d06aee7088f1fe1544031.