Rework Epp generation