Added changes to MagnetoMap