Restructured data/ to accomodate multiple generators