[Added] some changes to generators.