Refactor TypeConverter and fix compile errors caused by submodule update
Finish Converter children maps (unit tests fail at the moment)
Fix type mapping issues which were causing tests to fail