Start work to move data type mapping into data/config file.
Modified to use mapping file.