Update generation of Generics
Regenerate for callbacks