Fix contact list + start using dictionnary