Changes on Generator