Seperate CommandManager from Map