all of the code now uses the currently selected data types map