Update type converter to support more types - initial impl - still needs further testing