Added a number of additional types to convert.