Use the new in-d-gestion and generate ids a bit differently