Remove duplicate superclass and new gestion for list