Changes in MainDialog class and MapperDialog class