Finish adding new MagicValues system.