TBD-1018: add missing data type mappings.