Updated the classes to match our current classes

Is there an actual message class?