Add class for handling new EM Energy variables