Add in support for generated structures