Add in support for generated structures

try this one