Added Message mapper classes. Correct some classes