Added an option for producing assembly