Added TypeConverter and unit tests