Refactor/proper message classes