First steps towards new message format