Add EE, EF cats and MVAregEnergy