Replace switch by helper function
Include map/scenario information in the results