Fixed the conversion module to put everything neatly in mtw table