Improved  command manager.