Adding subgenerator for export