Refactored structure with new element "Generators"