Class MapperDialog fully redeveloped