More changes for new message format