Changes on generator