Add option to generate or not business structure
Improve business structure