ContentGenerator scope fixed