Remove empty spec
Change generators
Merge branch 'groups'