improve address gestion