The electricity market sector has suffered massive changes in the last few decades. The worldwide electricity market restructuring has been conducted to potentiate the increase in competitiveness and thus decrease electricity prices. However, the complexity in this sector has grown significantly as well, with the emergence of several new types of players, interacting in a constantly changing environment. Several electricity market simulators have been introduced in recent years with the purpose of supporting operators, regulators, and the involved players in understanding and dealing with this complex environment. This paper presents a new, enhanced version of MASCEM (Multi-Agent System for Competitive Electricity Markets), an electricity market simulator with over ten years of existence, which had to be restructured in order to be able to face the highly demanding requirements that the decision support in this field requires. This restructuring optimizes the performance of MASCEM, both in results and execution time. (C) 2016 Elsevier Ltd. All rights reserved.