Use Map to store variants

Romain Vigier requested to merge refactor/use-map into master Feb 27, 2020