Add exit + architecture gestion path