Added Struct generation