Added subgenerators