better handling of dictionnaries.