Changes in generator.*