Fix classes generation