More make up for Generator class