Better management of generic typing