Improved magic command system.