Make Magnet class more modular