Updates to use in-d-gestion