Feature/new generators