Made some changes. Fixed some errors caused by rename of converter classes.