Add slef-generation ids when needed. Remove name form dataset. Adapt many constructors