Message format refactor