Add a new class "MacroCell" for MacroSimulator