added a couple more types to converter to handle null