Refactored messages to make converting between model and telemetry messages easier.