Add more mapped value calculations
Add more mapped value calculations

klightspeed/EDDiscovery,andreaspada/EDDiscovery,EDDiscovery/EDDiscovery,klightspeed/EDDiscovery,EDDiscovery/EDDiscovery,klightspeed/EDDiscovery,EDDiscovery/EDDiscovery,andreaspada/EDDiscovery