Moved FlavorMap to Types.Metric + clarity changes