Restructured message format