Added Struct generation for portfolio level