Even more changes for new message format