Add in component subgenerator