Removed duplication of fields in messages