Added generator-bespoke output