refactored all parts of the message design (now object oriented)