ELDP: Work on generator