Add more type informations so that the wraping is transparent for the M module.
Regenerate dependencies.