Added component subgenerator